diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-01-17 17:41:20 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-17 17:45:20 -0800 |
| commit | 5e291d83c057f7d2bd0f76b41862dd39c2e7c5c3 (patch) | |
| tree | e8de15df8744e17c0de1963d56a6e82f916da76a | |
| parent | f412505aa8ce05ee8321fa6d4794b11158229b2d (diff) | |
| download | portage-5e291d83c057f7d2bd0f76b41862dd39c2e7c5c3.tar.gz portage-5e291d83c057f7d2bd0f76b41862dd39c2e7c5c3.tar.bz2 portage-5e291d83c057f7d2bd0f76b41862dd39c2e7c5c3.zip | |
EbuildBuild: Ensure $A is defined in pkg_nofetch.
This will fix bug #351505.
| -rw-r--r-- | pym/_emerge/EbuildBuild.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 00971cacd..562e77247 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) |