pld-ftp-admin: modules/ftptree.py Check for duplicates only in packages tha...

arekm arekm at pld-linux.org
Thu Jan 27 08:55:34 CET 2011


Author: arekm                        Date: Thu Jan 27 07:55:34 2011 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
Check for duplicates only in packages that we are trying to mv.

---- Files affected:
pld-ftp-admin/modules:
   ftptree.py (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.52 pld-ftp-admin/modules/ftptree.py:1.53
--- pld-ftp-admin/modules/ftptree.py:1.52	Tue Jan 11 19:49:10 2011
+++ pld-ftp-admin/modules/ftptree.py	Thu Jan 27 08:55:29 2011
@@ -451,7 +451,9 @@
         for pkg in marked:
             olderpkgnames = self.__find_older_pkgs(pkg)
             for i in olderpkgnames:
-                pkg.error('duplicate package: %s' % i)
+                markednames = [str(x) for x in marked]
+                if i in markednames:
+                    pkg.error('duplicate package: %s' % i)
 
     def __rmolderfromsrc(self, test = False):
         for pkg in self.marked4moving:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/modules/ftptree.py?r1=1.52&r2=1.53&f=u



More information about the pld-cvs-commit mailing list