From 0bcc693bfc3d09cd9fc022b954a7f396daf9a3e7 Mon Sep 17 00:00:00 2001 From: lxnay Date: Thu, 4 Dec 2008 22:23:35 +0000 Subject: [PATCH] Entropy/EquoInterface: - filterSatisfiedDependencies(): give up if the repo db is broken git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2717 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libraries/entropy.py b/libraries/entropy.py index d4ab8310a..342176ce4 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -2051,9 +2051,14 @@ class EquoInterface(TextInterface): repoMatch = self.atomMatch(dependency) if repoMatch[0] != -1: dbconn = self.openRepositoryDatabase(repoMatch[1]) - repo_pkgver = dbconn.retrieveVersion(repoMatch[0]) - repo_pkgtag = dbconn.retrieveVersionTag(repoMatch[0]) - repo_pkgrev = dbconn.retrieveRevision(repoMatch[0]) + try: + repo_pkgver = dbconn.retrieveVersion(repoMatch[0]) + repo_pkgtag = dbconn.retrieveVersionTag(repoMatch[0]) + repo_pkgrev = dbconn.retrieveRevision(repoMatch[0]) + except self.dbapi2.InterfaceError: + # package entry is broken + unsatisfiedDeps.add(dependency) + continue else: # dependency does not exist in our database unsatisfiedDeps.add(dependency)