- do not allow removal if building not finished

Changed files:
    modules/ftptree.py -> 1.19

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 47643466259cea3fe6f102bbbde270fa706de624..ae67758b5d5ac62c78fcc03aa2bd875791944c12 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -151,6 +151,9 @@ class FtpTree(BaseFtpTree):
             pkg.move(dsttree)
 
     def removepkgs(self):
+        if self.do_checkbuild:
+            self.__checkbuild()
+        bailoutonerror()
         for pkg in self.marked4removal:
             pkg.remove()
 
@@ -202,7 +205,12 @@ class FtpTree(BaseFtpTree):
             elif i[0]=='b':
                 requests[id]=requests[id]+i
         f.close()
-        for pkg in self.marked4moving:
+        marked=[]
+        if self.marked4moving:
+            marked=self.marked4moving
+        elif self.marked4removal:
+            marked=self.marked4removal
+        for pkg in marked:
             for bid in pkg.build.keys():
                 if requests.has_key(bid) and not requests[bid].find('?') == -1:
                     perror("%s (buildid %s) building not finished" % (pkg,bid))