From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 18 Jan 2011 01:41:20 +0000 (-0800)
Subject: EbuildBuild: Ensure $A is defined in pkg_nofetch.
X-Git-Tag: v2.2.0_alpha17~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4323bee2450b6635b2fd3129c15b6060d61a25b6;p=portage.git

EbuildBuild: Ensure $A is defined in pkg_nofetch.

This will fix bug #351505.
---

diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py
index a0779d06a..2c4f2b282 100644
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.EbuildExecuter import EbuildExecuter
@@ -226,6 +226,13 @@ class EbuildBuild(CompositeTask):
 			return
 
 		self.returncode = None
+		if "A" not in self.settings.configdict["pkg"]:
+			mytree = os.path.dirname(os.path.dirname(
+				os.path.dirname(self._ebuild_path)))
+			portdb = self.pkg.root_config.trees[self._tree].dbapi
+			fetch_map = portdb.getFetchMap(self.pkg.cpv,
+				useflags=self.pkg.use, mytree=mytree)
+			self.settings.configdict["pkg"]["A"] = " ".join(fetch_map)
 		nofetch_phase = EbuildPhase(background=self.background,
 			phase='nofetch', scheduler=self.scheduler, settings=self.settings)
 		self._start_task(nofetch_phase, self._nofetch_exit)