From 0d81c563c308918306ce4e543525d6306940b2ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 28 Sep 2015 23:27:59 +0200 Subject: [PATCH] - don't remove dst oackages when handling explicit moves to/ftom archive - don't check for duplicates when handling explicit moves to/from archive --- modules/ftptree.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ftptree.py b/modules/ftptree.py index 3e5691f..70db8a0 100644 --- 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) -- 2.44.0