Merged from trunk 5334:5335

Fix broken exception handling syntax causing strange exception reported
in bug #158608.

svn path=/main/branches/prefix/; revision=5336

diff --git a/bin/emerge b/bin/emerge
index 2db414e075550f6bf4c6d5395227c7220c6ff0a9..8ffc9bd67c8d47775c7a6a3a389328b9b4f4497e 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -751,7 +751,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)