commit b28d4942ed66d87bb31dbfa8c424317ba2ee81c3 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Sun Dec 30 10:12:50 2018 +0900
fix archive handling when moving packages around modules/ftptree.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- diff --git a/modules/ftptree.py b/modules/ftptree.py index 70db8a0..e228331 100644 --- a/modules/ftptree.py +++ b/modules/ftptree.py @@ -301,7 +301,7 @@ class FtpTree(BaseFtpTree): def testmove(self, dsttree, archivetree = None): self.__checkbuild(self.marked4moving) self.__checkarchs(dsttree, self.marked4moving) - if not self.treename.count("archive"): + if not dsttree.treename.count("archive"): self.__checkduplicates(self.marked4moving) self.__checksigns(dsttree, self.marked4moving, test = True) @@ -310,6 +310,7 @@ class FtpTree(BaseFtpTree): if not self.treename.count("archive"): self.__rmolderfromsrc(test = True) + if not dsttree.treename.count("archive"): self.__rmotherfromdst(dsttree, test = True, archivetree = archivetree) for pkg in self.marked4moving: @@ -328,6 +329,7 @@ class FtpTree(BaseFtpTree): if not self.treename.count("archive"): self.__rmolderfromsrc() + if not dsttree.treename.count("archive"): self.__rmotherfromdst(dsttree, archivetree = archivetree) for pkg in self.marked4moving: ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/projects/pld-ftp-admin.git/commitdiff/b28d4942ed66d87bb31dbfa8c424317ba2ee81c3 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit