From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 18 Dec 2006 03:47:31 +0000 (-0000)
Subject: Catch PortageException from portdbapi.aux_get since it can happen when gpg is in... 
X-Git-Tag: v2.1.2~276
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9c965f8df698f8565b52d50dbe233f9522f78d7;p=portage.git

Catch PortageException from portdbapi.aux_get since it can happen when gpg is in FEATURES.

svn path=/main/trunk/; revision=5316
---

diff --git a/bin/emerge b/bin/emerge
index b46ce3b68..f747ed094 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -750,7 +750,7 @@ class FakeVartree(portage.vartree):
 					live_metadata = dict(izip(portdb_keys,
 						portdb.aux_get(cpv, portdb_keys)))
 					self.dbapi.aux_update(cpv, live_metadata)
-				except KeyError:
+				except KeyError, portage_exception.PortageException:
 					if global_updates is None:
 						global_updates = \
 							grab_global_updates(portdb.porttree_root)