From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 20 Dec 2006 19:29:17 +0000 (-0000)
Subject: Fix broken exception handling syntax causing strange exception reported in bug #15860... 
X-Git-Tag: v2.1.2~260
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02cdfbb0c5f8c2bcc02e9adf8a3fc42af161e522;p=portage.git

Fix broken exception handling syntax causing strange exception reported in bug #158608.  Thanks to grobian for help troubleshooting.

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

diff --git a/bin/emerge b/bin/emerge
index 1cb50119f..2f73f5188 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, portage_exception.PortageException:
+				except (KeyError, portage_exception.PortageException):
 					if global_updates is None:
 						global_updates = \
 							grab_global_updates(portdb.porttree_root)