From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 4 Dec 2010 19:45:49 +0000 (-0800)
Subject: Scheduler: set MERGE_TYPE for pkg_pretend
X-Git-Tag: v2.2.0_alpha7~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=328e4f5d1ee2513383a539691259593a6b0c2096;p=portage.git

Scheduler: set MERGE_TYPE for pkg_pretend
---

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 91260d316..32019f22e 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, myrepo=x.repo)
 				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,