- _RPMVSF_NOSIGNATURES and _RPMVSF_NODIGESTS have been removed in rpm 5

[projects/pld-ftp-admin.git] / modules / ftptree.py

diff --git a/modules/ftptree.py b/modules/ftptree.py
index fee7cb924d945dd386de2b0ee2b7598b04a68bfb..36970964e5fb0b207981768a00f878e6c54b1bdd 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -90,6 +90,12 @@ class Pkg(BasePkg):
         pkg = nvr.split('-')[:-2]
         return pkg[-1] == 'debuginfo'
 
+    def is_sourcefile(self, file):
+        """
+        returns true if file is source package
+        """
+        return file[-8:] == '.src.rpm'
+
     # returns true if package build is integer
     def is_release(self):
         """
@@ -163,7 +169,7 @@ class Pkg(BasePkg):
                         rm(noarchcachedir + rpm + '.reqlist', test)
         rm(self.tree.basedir + '/SRPMS/.metadata/' + self.nvr + '.src.rpm.info', test)
 
-    def rpmfiles(self):
+    def rpmfiles(self, debugfiles = True, sourcefiles  = True):
         """
         Return rpm files related to this package
         """
@@ -171,9 +177,14 @@ class Pkg(BasePkg):
         for arch, rpms in self.files.items():
             for nvr in rpms:
                 if self.is_debuginfo(nvr):
-                    files.append(self.tree.basedir + '/' + arch + '/debuginfo/' + nvr)
+                    if debugfiles:
+                        files.append(self.tree.basedir + '/' + arch + '/debuginfo/' + nvr)
                 else:
-                    files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
+                    if self.is_sourcefile(nvr):
+                        if sourcefiles:
+                            files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
+                    else:
+                        files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
         return files
 
     def obsoletes(self):
@@ -185,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)
@@ -290,12 +300,15 @@ class FtpTree(BaseFtpTree):
     def testmove(self, dsttree, archivetree = None):
         self.__checkbuild(self.marked4moving)
         self.__checkarchs(dsttree, self.marked4moving)
+        self.__checkduplicates(self.marked4moving)
 
         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:
@@ -312,19 +325,21 @@ 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:
             pkg.move(dsttree)
 
-    def rpmfiles(self):
+    def rpmfiles(self, debugfiles = True, sourcefiles = True):
         if self.do_checkbuild:
             self.__checkbuild(self.marked4moving)
 
         files = []
         for pkg in self.marked4moving:
-            files += pkg.rpmfiles()
+            files += pkg.rpmfiles(debugfiles = debugfiles, sourcefiles = sourcefiles)
         return files
 
     def removepkgs(self):
@@ -344,8 +359,7 @@ class FtpTree(BaseFtpTree):
     # 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)
@@ -432,6 +446,17 @@ class FtpTree(BaseFtpTree):
                             missingarchs.append(arch)
                     pkg.warning('not built for archs: %s' % self.__arch_stringify(missingarchs))
 
+    def __checkduplicates(self, marked):
+        """
+        Checks if marked packages contain duplicate packages (with different versions)
+        """
+        for pkg in marked:
+            olderpkgnames = self.__find_older_pkgs(pkg)
+            for i in olderpkgnames:
+                markednames = [str(x) for x in marked]
+                if i in markednames:
+                    pkg.error('duplicate package: %s' % i)
+
     def __rmolderfromsrc(self, test = False):
         for pkg in self.marked4moving:
             olderpkgnames = self.__find_older_pkgs(pkg)