aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-08-20 14:09:03 -0700
committerZac Medico <zmedico@gentoo.org>2011-08-20 14:09:03 -0700
commit305acb6d016f36312344cc44a640fdbde8f4cd33 (patch)
treec944202500b7ca19d3c0798b35b641b4a0a3e684
parentImprove the invalid profile msg (bug 379327). (diff)
downloadportage-305acb6d016f36312344cc44a640fdbde8f4cd33.tar.gz
portage-305acb6d016f36312344cc44a640fdbde8f4cd33.tar.bz2
portage-305acb6d016f36312344cc44a640fdbde8f4cd33.zip
ebuild(1): show merge/noauto msg only if needed
-rwxr-xr-xbin/ebuild8
1 files changed, 4 insertions, 4 deletions
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(