[yum-commits] Branch 'yum-3_2_X' - 2 commits - rpmUtils/updates.py yum/__init__.py

[James Antill]

 rpmUtils/updates.py |   11 +++++++++--
 yum/__init__.py     |    2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 47f49081bf25560bbf7bce5a522174d2541d443f
Author: James Antill <james at and.org>
Date:   Fri Nov 12 11:25:04 2010 -0500

    Remove the sqlite-journal, for those repos. still using just .xml.

diff --git a/yum/__init__.py b/yum/__init__.py
index cfb60b3..f2a698d 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2066,7 +2066,7 @@ class YumBase(depsolve.Depsolve):
         return self._cleanFiles(exts, 'pkgdir', 'package')
 
     def cleanSqlite(self):
-        exts = ['sqlite', 'sqlite.bz2']
+        exts = ['sqlite', 'sqlite.bz2', 'sqlite-journal']
         return self._cleanFiles(exts, 'cachedir', 'sqlite')
 
     def cleanMetadata(self):
commit 38f49917b4d0f30312d9d5441530dc20812bd44b
Author: James Antill <james at and.org>
Date:   Thu Nov 11 15:22:27 2010 -0500

    Really minor code cleanup.

diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py
index 3c4bbb4..012d00d 100644
--- a/rpmUtils/updates.py
+++ b/rpmUtils/updates.py
@@ -190,15 +190,17 @@ class Updates:
                         (flag, version, pkgtup) )
 
         obsdict = {} # obseleting package -> [obsoleted package]
-        pkgdict = self.makeNADict(pkglist, 1)
 
         for pkgtup in pkglist:
-            (name, arch, epoch, ver, rel) = pkgtup
+            name = pkgtup[0]
             for obs_flag, obs_version, obsoleting in self._obsoletes_by_name.get(name, []):
                 if obs_flag in [None, 0] and name == obsoleting[0]: continue
                 if rpmUtils.miscutils.rangeCheck( (name, obs_flag, obs_version), pkgtup):
                     obsdict.setdefault(obsoleting, []).append(pkgtup)
 
+        if not obsdict:
+            return {}
+
         obslist = obsdict.keys()
         if newest:
             obslist = self._reduceListNewestByNameArch(obslist)
@@ -693,17 +695,22 @@ class Updates:
            compared to each other for highest version only foo.i386 and 
            foo.i386 will be compared"""
         highdict = {}
+        done = False
         for pkgtup in tuplelist:
             (n, a, e, v, r) = pkgtup
             if (n, a) not in highdict:
                 highdict[(n, a)] = pkgtup
             else:
                 pkgtup2 = highdict[(n, a)]
+                done = True
                 (n2, a2, e2, v2, r2) = pkgtup2
                 rc = rpmUtils.miscutils.compareEVR((e,v,r), (e2, v2, r2))
                 if rc > 0:
                     highdict[(n, a)] = pkgtup
         
+        if not done:
+            return tuplelist
+
         return highdict.values()