From 3edcda026f69d5fd1b54900474a5918da7cd1821 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 26 Nov 2007 11:59:47 +0000
Subject: --buildpkgonly will not merge anything, so it cancels all binary
 package options.

svn path=/main/branches/2.1.2/; revision=8685
---
 bin/emerge | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'bin/emerge')

diff --git a/bin/emerge b/bin/emerge
index 49204d9be..89dd81752 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -6399,6 +6399,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
 
-- 
cgit v1.2.3-1-g7c22