- don't remove dst oackages when handling explicit moves to/ftom archive

- don't check for duplicates when handling explicit moves to/from archive

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 3e5691f443cab0b74d6eb57566b458a281ea230d..70db8a0aa0ac476e64f27a2a1659b801af38e90d 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -301,7 +301,8 @@ class FtpTree(BaseFtpTree):
     def testmove(self, dsttree, archivetree = None):
         self.__checkbuild(self.marked4moving)
         self.__checkarchs(dsttree, self.marked4moving)
-        self.__checkduplicates(self.marked4moving)
+        if not self.treename.count("archive"):
+            self.__checkduplicates(self.marked4moving)
 
         self.__checksigns(dsttree, self.marked4moving, test = True)
         self.__checkforobsoletes(dsttree, self.marked4moving, test = True)
@@ -309,8 +310,7 @@ class FtpTree(BaseFtpTree):
 
         if not self.treename.count("archive"):
             self.__rmolderfromsrc(test = True)
-
-        self.__rmotherfromdst(dsttree, test = True, archivetree = archivetree)
+            self.__rmotherfromdst(dsttree, test = True, archivetree = archivetree)
 
         for pkg in self.marked4moving:
             pkg.move(dsttree, test = True)
@@ -328,8 +328,7 @@ class FtpTree(BaseFtpTree):
 
         if not self.treename.count("archive"):
             self.__rmolderfromsrc()
-
-        self.__rmotherfromdst(dsttree, archivetree = archivetree)
+            self.__rmotherfromdst(dsttree, archivetree = archivetree)
 
         for pkg in self.marked4moving:
             pkg.move(dsttree)