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

[James Antill]

 yum/sqlitesack.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3120676a73219b018d317d8adaac0d858d751a3b
Author: James Antill <james at and.org>
Date:   Sat Oct 4 13:32:45 2008 -0400

    Give a nicer message when filelists contains pkgKeys primary doesn't

diff --git a/yum/repoMDObject.py b/yum/repoMDObject.py
old mode 100644
new mode 100755
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 578d0b9..f0f34dd 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -407,9 +407,12 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
         if not self._key2pkg[repo].has_key(pkgKey):
             sql = "SELECT pkgKey, pkgId, name, epoch, version, release " \
                   "FROM packages WHERE pkgKey = ?"
-            cur = self._sql_MD('primary', repo, sql, (pkgKey,))
-            po = self.pc(repo, cur.fetchone())
-            self._key2pkg[repo][pkgKey] = po
+            data = self._sql_MD('primary', repo, sql, (pkgKey,)).fetchone()
+            if data is None:
+                msg = "pkgKey %s doesn't exist in repo %s" % (pkgKey, repo)
+                raise Errors.RepoError, msg
+
+            self._key2pkg[repo][pkgKey] = self.pc(repo, data)
         if self._pkgArchExcluded(self._key2pkg[repo][pkgKey].arch):
             return None
         return self._key2pkg[repo][pkgKey]