From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 20 Aug 2011 21:09:03 +0000 (-0700)
Subject: ebuild(1): show merge/noauto msg only if needed
X-Git-Tag: v2.2.0_alpha52~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=305acb6d016f36312344cc44a640fdbde8f4cd33;p=portage.git

ebuild(1): show merge/noauto msg only if needed
---

diff --git a/bin/ebuild b/bin/ebuild
index f8b6d79e6..db7e5e385 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -57,10 +57,6 @@ opts, pargs = parser.parse_args(args=sys.argv[1:])
 if len(pargs) < 2:
 	parser.error("missing required args")
 
-if "merge" in pargs:
-	print("Disabling noauto in features... merge disables it. (qmerge doesn't)")
-	os.environ["FEATURES"] = os.environ.get("FEATURES", "") + " -noauto"
-
 os.environ["PORTAGE_CALLER"]="ebuild"
 try:
 	import portage
@@ -257,6 +253,10 @@ if "test" in pargs:
 
 tmpsettings.features.discard("fail-clean")
 
+if "merge" in pargs and "noauto" in tmpsettings.features:
+	print("Disabling noauto in features... merge disables it. (qmerge doesn't)")
+	tmpsettings.features.discard("noauto")
+
 try:
 	metadata = dict(zip(Package.metadata_keys,
 		portage.db[portage.settings["ROOT"]][mytree].dbapi.aux_get(