pld-ftp-admin: modules/ftptree.py, scripts/move.py - add check for obsoletes

[glen]

Author: glen                         Date: Wed Mar  3 12:24:28 2010 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- add check for obsoletes

---- Files affected:
pld-ftp-admin/modules:
   ftptree.py (1.41 -> 1.42) 
pld-ftp-admin/scripts:
   move.py (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.41 pld-ftp-admin/modules/ftptree.py:1.42
--- pld-ftp-admin/modules/ftptree.py:1.41	Tue Jun 30 06:22:35 2009
+++ pld-ftp-admin/modules/ftptree.py	Wed Mar  3 13:24:23 2010
@@ -163,6 +163,36 @@
                     files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
         return files
 
+    def obsoletes(self):
+        """
+        Return obsoletes for all packages in Pkg:
+
+        {'php-geshi': set(['geshi'])}
+
+        """
+        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)
+            return hdr
+
+        obsoletes = {}
+        for rpmfile in self.rpmfiles():
+            hdr = rpmhdr(rpmfile)
+            if not hdr[rpm.RPMTAG_OBSOLETES]:
+                continue
+
+            name = hdr[rpm.RPMTAG_NAME]
+            if not name in obsoletes:
+                obsoletes[name] = set()
+
+            for tag in hdr[rpm.RPMTAG_OBSOLETES]:
+                obsoletes[name].add(tag)
+
+        return obsoletes
+
     def move(self, dsttree, test = False):
         if dsttree.has_key(self.nvr):
             movedany = False
@@ -247,6 +277,7 @@
         self.__checkarchs(dsttree, self.marked4moving)
 
         self.__checksigns(dsttree, self.marked4moving, test = True)
+        self.__checkforobsoletes(dsttree, self.marked4moving, test = True)
         
         self.__rmolderfromsrc(test = True)
         self.__rmotherfromdst(dsttree, test = True, archivetree = archivetree)
@@ -307,13 +338,14 @@
 
     def __mark4something(self, wannabepkgs, markfunction):
         def chopoffextension(pkg):
-            found=pkg.find('.src.rpm')
-            if found==-1:
+            found = pkg.find('.src.rpm')
+            if found == -1:
                 return pkg
             else:
                 return pkg[:found]
+
         for wannabepkg in wannabepkgs:
-            pkgname=chopoffextension(wannabepkg)
+            pkgname = chopoffextension(wannabepkg)
             if pkgname in self.pkgnames:
                 if not pkgname in self.loadedpkgs.keys():
                     self.loadedpkgs[pkgname]=Pkg(pkgname, self)
@@ -427,7 +459,7 @@
             unsigned = 0
             for file in pkg.rpmfiles():
                 if not is_signed(file):
-                    unsigned += 1;
+                    unsigned += 1
 
             if unsigned != 0:
                 if test == True:
@@ -435,3 +467,29 @@
                         pkg.warning('%d files not signed' % unsigned)
                 else:
                     pkg.error('%d files not signed' % unsigned)
+
+    def __checkforobsoletes(self, tree, pkgs, test = False):
+        """
+        Checks queue file if package obsoletes something in destination tree and suggest for removal.
+
+        Only NAME tag is compared, i.e virtual packages do not get reported.
+
+        """
+        if test != True:
+            return
+
+        def findbyname(name):
+            def x(nvr):
+                return '-'.join(nvr.split('-')[:-2]) == name
+            return filter(x, tree.pkgnames)
+
+        for pkg in pkgs:
+            obsoletes = pkg.obsoletes()
+            if not obsoletes:
+                continue
+
+            for pn, setlist in obsoletes.items():
+                for item in setlist:
+                    p = findbyname(item)
+                    if p:
+                        pkg.warning('obsoletes %s in dest tree, perhaps you want rmpkg' % (p,))

================================================================
Index: pld-ftp-admin/scripts/move.py
diff -u pld-ftp-admin/scripts/move.py:1.18 pld-ftp-admin/scripts/move.py:1.19
--- pld-ftp-admin/scripts/move.py:1.18	Wed Oct 21 20:28:52 2009
+++ pld-ftp-admin/scripts/move.py	Wed Mar  3 13:24:23 2010
@@ -76,7 +76,7 @@
 if logs_list == None:
     sys.exit(0)
 
-print 'Sending mail notification...',
+print 'Sending mail notification to %s...' % logs_list
 
 pkgs = {}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/modules/ftptree.py?r1=1.41&r2=1.42&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/move.py?r1=1.18&r2=1.19&f=u