]> git.pld-linux.org Git - projects/pld-ftp-admin.git/blobdiff - modules/ftptree.py
- white space cleanup
[projects/pld-ftp-admin.git] / modules / ftptree.py
index a495bd21a42bdbc80fa28eda56ff7d394bab6f3a..aa2cebedf4ed4267c420151f856f4a1017d05279 100644 (file)
@@ -151,7 +151,7 @@ class Pkg(BasePkg):
         for arch in self.files.keys():
             for rpm in self.files[arch]:
                 f.write("file:%s:%s\n" % (arch, rpm))
-        
     def remove(self, test = False):
         """
         Remove package from ftp
@@ -196,7 +196,6 @@ class Pkg(BasePkg):
         """
         def rpmhdr(pkg):
             ts = rpm.ts()
-            ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
             fdno = os.open(pkg, os.O_RDONLY)
             hdr = ts.hdrFromFdno(fdno)
             os.close(fdno)
@@ -306,8 +305,10 @@ class FtpTree(BaseFtpTree):
         self.__checksigns(dsttree, self.marked4moving, test = True)
         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 +325,9 @@ class FtpTree(BaseFtpTree):
         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:
@@ -351,13 +354,11 @@ class FtpTree(BaseFtpTree):
 
     def mark4moving(self, wannabepkgs):
         self.__mark4something(wannabepkgs, Pkg.mark4moving)
-        
 
     # Internal functions below
     def __arch_stringify(self, list):
         ret = []
-        # XXX: is dist line in any config?
-        dist = 'ac'
+        dist = config.ftp_dist;
         for arch in list:
             ret.append(dist + '-' + arch)
         return ' '.join(ret)
This page took 0.039687 seconds and 4 git commands to generate.