pld-ftp-admin: modules/ftptree.py, scripts/remove.py - fixed a bug...

[mmazur]

Author: mmazur                       Date: Sat Jul 23 16:24:55 2005 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- fixed a bug in remove.py and did some rearrangements in ftptree.py, since
  I'll need them in a moment

---- Files affected:
pld-ftp-admin/modules:
   ftptree.py (1.19 -> 1.20) 
pld-ftp-admin/scripts:
   remove.py (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.19 pld-ftp-admin/modules/ftptree.py:1.20
--- pld-ftp-admin/modules/ftptree.py:1.19	Thu Jul 21 18:18:56 2005
+++ pld-ftp-admin/modules/ftptree.py	Sat Jul 23 18:24:50 2005
@@ -35,6 +35,8 @@
     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 @@
     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 @@
 
     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 @@
                 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 @@
             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

================================================================
Index: pld-ftp-admin/scripts/remove.py
diff -u pld-ftp-admin/scripts/remove.py:1.5 pld-ftp-admin/scripts/remove.py:1.6
--- pld-ftp-admin/scripts/remove.py:1.5	Tue Jun 21 00:27:06 2005
+++ pld-ftp-admin/scripts/remove.py	Sat Jul 23 18:24:50 2005
@@ -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 @@
     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:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/modules/ftptree.py?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/pld-ftp-admin/scripts/remove.py?r1=1.5&r2=1.6&f=u