From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 30 Dec 2018 01:12:50 +0000 (+0900)
Subject: fix archive handling when moving packages around
X-Git-Url: http://git.pld-linux.org/?p=projects%2Fpld-ftp-admin.git;a=commitdiff_plain;h=b28d4942ed66d87bb31dbfa8c424317ba2ee81c3

fix archive handling when moving packages around
---

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: