diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-01-18 12:43:12 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-18 14:26:05 -0800 |
| commit | 511f8329823f0383187d9d3b6d71cd62ff6b32e2 (patch) | |
| tree | 7113e9d926b42a865cc1aa75bf04f3cda507f29e /pym/_emerge | |
| parent | 903114640c5f84cd4e40da72f2e7ab286fa8995c (diff) | |
| download | portage-511f8329823f0383187d9d3b6d71cd62ff6b32e2.tar.gz portage-511f8329823f0383187d9d3b6d71cd62ff6b32e2.tar.bz2 portage-511f8329823f0383187d9d3b6d71cd62ff6b32e2.zip | |
doebuild_environent: handle A/AA initialization
This allows elimination of duplicate code, some of which was introduced
by the fix for bug #351505.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/EbuildBuild.py | 7 | ||||
| -rw-r--r-- | pym/_emerge/EbuildExecuter.py | 8 |
2 files changed, 1 insertions, 14 deletions
diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 54d81263b..5645eade9 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -226,13 +226,6 @@ 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.enabled, 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) diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py index 419ee6b1a..d3a4dd8dd 100644 --- a/pym/_emerge/EbuildExecuter.py +++ b/pym/_emerge/EbuildExecuter.py @@ -35,13 +35,7 @@ class EbuildExecuter(CompositeTask): portdb = pkg.root_config.trees['porttree'].dbapi ebuild_path = settings['EBUILD'] - mytree = os.path.dirname(os.path.dirname( - os.path.dirname(ebuild_path))) - alist = portdb.getFetchMap(pkg.cpv, - useflags=pkg.use.enabled, mytree=mytree) - aalist = portdb.getFetchMap(pkg.cpv, mytree=mytree) - settings.configdict["pkg"]["A"] = " ".join(alist) - settings.configdict["pkg"]["AA"] = " ".join(aalist) + alist = settings.configdict["pkg"].get("A", "").split() _prepare_fake_distdir(settings, alist) if eapi_exports_replace_vars(settings['EAPI']): |