From b77b9de23389690a9e3b074af2f848ac9d525de3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 18 Jan 2011 12:43:12 -0800 Subject: doebuild_environent: handle A/AA initialization This allows elimination of duplicate code, some of which was introduced by the fix for bug #351505. --- pym/_emerge/EbuildExecuter.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'pym/_emerge/EbuildExecuter.py') 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']): -- cgit v1.2.3-1-g7c22