Duplicate packages with different version or release are considered to be errors.

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

diff --git a/modules/ftptree.py b/modules/ftptree.py
index e45645d03f13981c56e0d3443ab83b4bd262f084..9873d9b4a25996d50a1a4d6c117e22ca52022036 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -90,6 +90,19 @@ class Pkg(BasePkg):
         pkg = nvr.split('-')[:-2]
         return pkg[-1] == 'debuginfo'
 
+    # returns true if package build is integer
+    def is_release(self):
+        """
+        To account Release tags with subver macros, we consider integer release
+        if it contains odd number of dots:
+
+        1 -> True
+        0.1 -> False
+        0.%{subver}.%{rel}, %{rel} = 1 -> 0.20010.1 -> True
+        0.%{subver}.%{rel}, %{rel} = 0.1 -> 0.20010.0.1 -> False
+        """
+        return self.release.count('.') % 2 == 0
+
     def mark4moving(self):
         if not self.marked4moving:
             # Only one pkg in this pool can be marked for moving
@@ -150,7 +163,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):
         """
         Return rpm files related to this package
         """
@@ -158,7 +171,8 @@ 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)
         return files
@@ -205,7 +219,7 @@ class Pkg(BasePkg):
                         msg = "TEST "
                     pinfo("%sArch %s for %s is already present in dest tree; removing from srctree" % (msg, arch, self.nvr))
                     for rpm in self.files[arch]:
-                        if self.is_debuginfo(rpm):
+                        if self.il-page-warningus_debuginfo(rpm):
                             rm(self.tree.basedir + '/' + arch + '/debuginfo/' + rpm, test)
                         else:
                             rm(self.tree.basedir + '/' + arch + '/RPMS/' + rpm, test)
@@ -277,9 +291,11 @@ class FtpTree(BaseFtpTree):
     def testmove(self, dsttree, archivetree = None):
         self.__checkbuild(self.marked4moving)
         self.__checkarchs(dsttree, self.marked4moving)
+        self.__checduplicates(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)
         self.__rmotherfromdst(dsttree, test = True, archivetree = archivetree)
@@ -418,6 +434,15 @@ class FtpTree(BaseFtpTree):
                             missingarchs.append(arch)
                     pkg.warning('not built for archs: %s' % self.__arch_stringify(missingarchs))
 
+    def __checduplicates(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:
+                pkg.error('duplicate package: %s' % i)
+
     def __rmolderfromsrc(self, test = False):
         for pkg in self.marked4moving:
             olderpkgnames = self.__find_older_pkgs(pkg)
@@ -502,3 +527,15 @@ class FtpTree(BaseFtpTree):
                     p = findbyname(item)
                     if p:
                         pkg.warning('obsoletes %s (via %s) in dest tree, perhaps you want rmpkg' % (p,pn))
+
+    def __checkforrelease(self, tree, pkgs, test = False):
+        """
+        Checks queue file if package release is non integer.
+
+        """
+        if test != True:
+            return
+
+        for pkg in pkgs:
+            if not pkg.is_release():
+                pkg.warning('non-integer release: %s' % pkg.release)