pld-ftp-admin: scripts/move.py, scripts/remove.py, scripts/test-move.py Aut...

[arekm]

Author: arekm                        Date: Wed Oct 21 18:28:57 2009 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
Automaticly remove duplicates from package lists.

---- Files affected:
pld-ftp-admin/scripts:
   move.py (1.17 -> 1.18) , remove.py (1.7 -> 1.8) , test-move.py (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: pld-ftp-admin/scripts/move.py
diff -u pld-ftp-admin/scripts/move.py:1.17 pld-ftp-admin/scripts/move.py:1.18
--- pld-ftp-admin/scripts/move.py:1.17	Tue Jun 30 06:22:35 2009
+++ pld-ftp-admin/scripts/move.py	Wed Oct 21 20:28:52 2009
@@ -56,7 +56,8 @@
         archivetree = None
     if nocheckbuild:
         srctree.do_checkbuild = False
-    srctree.mark4moving(sys.argv[3:])
+    pkgs = list(set(sys.argv[3:]))
+    srctree.mark4moving(pkgs)
 
     srctree.movepkgs(dsttree, archivetree = archivetree)
 except ftptree.SomeError:

================================================================
Index: pld-ftp-admin/scripts/remove.py
diff -u pld-ftp-admin/scripts/remove.py:1.7 pld-ftp-admin/scripts/remove.py:1.8
--- pld-ftp-admin/scripts/remove.py:1.7	Wed May 27 00:45:32 2009
+++ pld-ftp-admin/scripts/remove.py	Wed Oct 21 20:28:52 2009
@@ -23,7 +23,8 @@
 try:
     tree=ftptree.FtpTree(sys.argv[1])
     #tree.do_checkbuild=False
-    tree.mark4removal(sys.argv[2:])
+    pkgs = list(set(sys.argv[2:]))
+    tree.mark4removal(pkgs)
     tree.removepkgs()
 except ftptree.SomeError:
     # In case of problems we need to unlock the tree before exiting

================================================================
Index: pld-ftp-admin/scripts/test-move.py
diff -u pld-ftp-admin/scripts/test-move.py:1.8 pld-ftp-admin/scripts/test-move.py:1.9
--- pld-ftp-admin/scripts/test-move.py:1.8	Tue Jun 30 06:22:35 2009
+++ pld-ftp-admin/scripts/test-move.py	Wed Oct 21 20:28:52 2009
@@ -46,7 +46,8 @@
         archivetree = ftptree.FtpTree(archivetreename)
     else:
         archivetree = None
-    srctree.mark4moving(sys.argv[3:])
+    pkgs = list(set(sys.argv[3:]))
+    srctree.mark4moving(pkgs)
 except ftptree.SomeError:
     # In case of problems we need to unlock the trees before exiting
     ftpio.unlock(sys.argv[1])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/move.py?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/remove.py?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/test-move.py?r1=1.8&r2=1.9&f=u