From 98f187a36e9d52896fbdcbd6dffc0b771f5bedd1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 4 Dec 2010 11:45:49 -0800 Subject: [PATCH] Scheduler: set MERGE_TYPE for pkg_pretend --- pym/_emerge/Scheduler.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 324e95517..183a922f9 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"]["MERGE_TYPE"] = "binary" else: tree = "porttree" @@ -1032,6 +1033,10 @@ class Scheduler(PollScheduler): ebuild_path = portdb.findname(x.cpv) if ebuild_path is None: raise AssertionError("ebuild not found for '%s'" % x.cpv) + if self._build_opts.buildpkgonly: + settings.configdict["pkg"]["MERGE_TYPE"] = "buildonly" + else: + settings.configdict["pkg"]["MERGE_TYPE"] = "source" portage.package.ebuild.doebuild.doebuild_environment(ebuild_path, "pretend", settings=settings, -- 2.26.2