[yum-git] yum/sqlitesack.py

Seth Vidal skvidal at linux.duke.edu
Fri May 9 15:45:45 UTC 2008


 yum/sqlitesack.py |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 5ea0ec9dcbf3654013290bb7fba7ab645bb16919
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri May 9 11:45:16 2008 -0400

    'fixes' for invalid metadata made with createrepo -n - this harkens back to rhl 9 and stupidity
    with epochs

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index d76a1a1..f230e34 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -60,6 +60,10 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
         self.state = None
         self._loadedfiles = False
         self._read_db_obj(db_obj)
+        # for stupid metadata created without epochs listed in the version tag
+        # die die
+        if self.epoch is None:
+            self.epoch = '0'
         self.id = self.pkgId
         self.ver = self.version 
         self.rel = self.release 
@@ -139,6 +143,8 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
                 raise KeyError, str(e)
             raise                         
         value = r[0]
+        if varname == 'epoch' and value is None:
+            value = '0'
         if varname in {'vendor' : 1, 'packager' : 1, 'buildhost' : 1,
                        'license' : 1, 'group' : 1,
                        'summary' : 1, 'description' : 1, 'sourcerpm' : 1,



More information about the Yum-cvs-commits mailing list