summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index ae5bafb5..dff6898a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4704,7 +4704,8 @@ def action_build(settings, trees, mtimedb,
sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n")
sys.exit(1)
- if "--pretend" not in myopts:
+ if "--pretend" not in myopts and \
+ not ("--quiet" in myopts and "--ask" not in myopts):
if "--resume" in myopts:
validate_merge_list(trees, mtimedb["resume"]["mergelist"])
mymergelist = mtimedb["resume"]["mergelist"]