From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 25 May 2011 06:33:12 +0000 (-0700)
Subject: FakeVartree: tweak _aux_get_wrapper repo handling
X-Git-Tag: v2.2.0_alpha36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b6b6dbed2ef61dfdb1cb5420e15c2de4561a992;p=portage.git

FakeVartree: tweak _aux_get_wrapper repo handling
---

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index abdbf7386..8ed458dbb 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -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)))