From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 26 Nov 2007 11:38:06 +0000 (-0000)
Subject: --buildpkgonly will not merge anything, so
X-Git-Tag: v2.2_pre1~310
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a95f5d8314ef899ae5455089673b4de8b50b08b9;p=portage.git

--buildpkgonly will not merge anything, so
it cancels all binary package options.

svn path=/main/trunk/; revision=8683
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bfb306634..0a4c0027c 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -6943,6 +6943,13 @@ def emerge_main():
 	if ("getbinpkg" in settings.features):
 		myopts["--getbinpkg"] = True
 
+	if "--buildpkgonly" in myopts:
+		# --buildpkgonly will not merge anything, so
+		# it cancels all binary package options.
+		for opt in ("--getbinpkg", "--getbinpkgonly",
+			"--usepkg", "--usepkgonly"):
+			myopts.pop(opt, None)
+
 	if "--skipfirst" in myopts and "--resume" not in myopts:
 		myopts["--resume"] = True