- fixed a bug in remove.py and did some rearrangements in ftptree.py, since

  I'll need them in a moment

Changed files:
    bin/pfa-rmpkg -> 1.6
    modules/ftptree.py -> 1.20

diff --git a/bin/pfa-rmpkg b/bin/pfa-rmpkg
index 5fa6ed22b816cb1906889df3add6f0d4baab2356..dcf379977ebd00b22e697e92ccdfbac375e93a24 100755 (executable)
--- a/bin/pfa-rmpkg
+++ b/bin/pfa-rmpkg
@@ -3,7 +3,7 @@
 
 import sys, os
 sys.path.insert(0, os.environ['HOME']+'/pld-ftp-admin/modules')
-from ftptree import FtpTree
+import ftptree
 from common import checkdir
 import ftpio
 
@@ -21,7 +21,7 @@ if not ftpio.lock(sys.argv[1], True):
     sys.exit(1)
 
 try:
-    tree=FtpTree(sys.argv[1])
+    tree=ftptree.FtpTree(sys.argv[1])
     tree.mark4removal(sys.argv[2:])
     tree.removepkgs()
 except ftptree.SomeError:

diff --git a/modules/ftptree.py b/modules/ftptree.py
index ae67758b5d5ac62c78fcc03aa2bd875791944c12..06a0200f83bea65d2639bcab6ecb3dbff7d5339f 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -35,6 +35,8 @@ class Pkg(BasePkg):
     def __init__(self, name, tree):
         self.marked4removal=False
         self.marked4moving=False
+        self.errors=[]
+        self.warnings=[]
         BasePkg.__init__(self, name, tree)
 
     def mark4moving(self):
@@ -131,18 +133,18 @@ class FtpTree(BaseFtpTree):
     def keys(self):
         return self.pkgnames
 
-    def candidates4move(self):
+    def checktree(self, dsttree):
         pass
 
     def testmove(self, dsttree):
-        self.__checkbuild()
-        self.__checkarchs(dsttree)
+        self.__checkbuild(self.marked4moving)
+        self.__checkarchs(dsttree, self.marked4moving)
 
     def movepkgs(self, dsttree):
         if self.do_checkbuild:
-            self.__checkbuild()
+            self.__checkbuild(self.marked4moving)
         bailoutonerror()
-        self.__checkarchs(dsttree)
+        self.__checkarchs(dsttree, self.marked4moving)
         bailoutonerror()
         self.__rmolderfromsrc()
         self.__rmotherfromdst(dsttree)
@@ -152,7 +154,7 @@ class FtpTree(BaseFtpTree):
 
     def removepkgs(self):
         if self.do_checkbuild:
-            self.__checkbuild()
+            self.__checkbuild(self.marked4removal)
         bailoutonerror()
         for pkg in self.marked4removal:
             pkg.remove()
@@ -192,7 +194,7 @@ class FtpTree(BaseFtpTree):
                 perror('%s not found in source tree' % pkgname)
         bailoutonerror()
 
-    def __checkbuild(self):
+    def __checkbuild(self, marked):
         f=urllib.urlopen(config.builderqueue)
         #f=open('queue.txt')
         requests={}
@@ -205,18 +207,13 @@ class FtpTree(BaseFtpTree):
             elif i[0]=='b':
                 requests[id]=requests[id]+i
         f.close()
-        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))
 
-    def __checkarchs(self, dsttree):
-        for pkg in self.marked4moving:
+    def __checkarchs(self, dsttree, marked):
+        for pkg in marked:
             if len(pkg.files.keys()) <= 1:
                 perror('%s has only src.rpm built' % pkg)
                 continue