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

diff --git a/bin/ebuild b/bin/ebuild
index f8b6d79e6559866899fdadd9e72c1c0a722352b8..db7e5e3857c4663be3034cc77b8ef0d8a1211216 100755 (executable)
--- 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(