[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/packages.py yum/sqlitesack.py

[skvidal at osuosl.org]

 yum/packages.py   |    2 ++
 yum/sqlitesack.py |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit d2f0e2baba6f3a48ee401135e8152eedb52baf6a
Merge: a6abc59... 7f381ca...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu May 13 12:32:47 2010 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Remove "No transaction set" error, for YumLocalPackage

commit a6abc59696d0c7c5e265aa3b579fe156ac92e2dc
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu May 13 12:09:18 2010 -0400

    oddball case where rpm coughed up an EMPTY provides entry.
    
    safe to skip them - also filed a bug with rpm to never let this happen

diff --git a/yum/packages.py b/yum/packages.py
index ac45518..0947c42 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -398,6 +398,8 @@ class RpmBase(object):
         if printable:
             results = []
             for prco in prcos:
+                if not prco[0]: # empty or none or whatever, doesn't matter
+                    continue
                 results.append(misc.prco_tuple_to_string(prco))
             return results
 
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 7873411..84607c6 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -388,6 +388,8 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
             cur = self._sql_MD('primary', sql, (self.pkgKey,))
             self.prco[prcotype] = [ ]
             for ob in cur:
+                if not ob['name']:
+                    continue
                 prco_set = (_share_data(ob['name']), _share_data(ob['flags']),
                             (_share_data(ob['epoch']),
                              _share_data(ob['version']),