diff options
Diffstat (limited to 'bin/ebuild')
| -rwxr-xr-x | bin/ebuild | 8 |
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( |