From 5ec72f096420a170d0f778116722661443cc2c15 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 5 Dec 2010 03:08:54 -0800 Subject: Sync EMERGE_FROM code with MERGE_TYPE code. --- pym/_emerge/Scheduler.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pym/_emerge/Scheduler.py') diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 32019f22e..2d252f8cb 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1025,6 +1025,7 @@ class Scheduler(PollScheduler): os.makedirs(infloc) portage.xpak.tbz2(tbz2_file).unpackinfo(infloc) ebuild_path = os.path.join(infloc, x.pf + ".ebuild") + settings.configdict["pkg"]["EMERGE_FROM"] = "binary" settings.configdict["pkg"]["MERGE_TYPE"] = "binary" else: @@ -1033,6 +1034,7 @@ class Scheduler(PollScheduler): ebuild_path = portdb.findname(x.cpv, myrepo=x.repo) if ebuild_path is None: raise AssertionError("ebuild not found for '%s'" % x.cpv) + settings.configdict["pkg"]["EMERGE_FROM"] = "ebuild" if self._build_opts.buildpkgonly: settings.configdict["pkg"]["MERGE_TYPE"] = "buildonly" else: -- cgit v1.2.3-1-g7c22