Author: glen Date: Tue Mar 22 06:10:17 2011 GMT
Module: pld-ftp-admin Tag: HEAD
---- Log message:
- do not remove older pkgs when moving out from archive tree
---- Files affected:
pld-ftp-admin/modules:
ftptree.py (1.53 -> 1.54)
---- Diffs:
================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.53 pld-ftp-admin/modules/ftptree.py:1.54
--- pld-ftp-admin/modules/ftptree.py:1.53 Thu Jan 27 08:55:29 2011
+++ pld-ftp-admin/modules/ftptree.py Tue Mar 22 07:10:12 2011
@@ -307,7 +307,9 @@
self.__checkforobsoletes(dsttree, self.marked4moving, test = True)
self.__checkforrelease(dsttree, self.marked4moving, test = True)
- self.__rmolderfromsrc(test = True)
+ if not self.treename.count("archive"):
+ self.__rmolderfromsrc(test = True)
+
self.__rmotherfromdst(dsttree, test = True, archivetree = archivetree)
for pkg in self.marked4moving:
@@ -324,7 +326,9 @@
self.__checksigns(dsttree, self.marked4moving)
bailoutonerror()
- self.__rmolderfromsrc()
+ if not self.treename.count("archive"):
+ self.__rmolderfromsrc()
+
self.__rmotherfromdst(dsttree, archivetree = archivetree)
for pkg in self.marked4moving:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/modules/ftptree.py?r1=1.53&r2=1.54&f=u