FakeVartree: tweak _aux_get_wrapper repo handling v2.2.0_alpha36
authorZac Medico <zmedico@gentoo.org>
Wed, 25 May 2011 06:33:12 +0000 (23:33 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 25 May 2011 06:33:12 +0000 (23:33 -0700)
pym/_emerge/FakeVartree.py

index abdbf73869c9c344334509dd36fbd319f839ac48..8ed458dbb8fe9bde1419d4a74d01c973b1179f50 100644 (file)
@@ -88,10 +88,9 @@ class FakeVartree(vartree):
                self._aux_get_history.add(pkg)
                # We need to check the EAPI, and this also raises
                # a KeyError to the caller if appropriate.
-               installed_eapi, = self._aux_get(pkg, ["EAPI"])
+               installed_eapi, repo = self._aux_get(pkg, ["EAPI", "repository"])
                try:
                        # Use the live ebuild metadata if possible.
-                       repo = self._aux_get(pkg, ["repository"])[0]
                        repo = _gen_valid_repo(repo)
                        live_metadata = dict(zip(self._portdb_keys,
                                self._portdb.aux_get(pkg, self._portdb_keys, myrepo=repo)))