summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 938a55f5f..d68d793bc 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3884,7 +3884,12 @@ def action_build(settings, trees, mtimedb,
show_blocker_docs_link()
sys.exit(1)
if mergecount==0:
- if settings["AUTOCLEAN"] and "yes"==settings["AUTOCLEAN"]:
+ if "--noreplace" in myopts and favorites:
+ print
+ for x in favorites:
+ print " %s %s" % (good("*"), x)
+ prompt="Would you like to add these packages to your world favorites?"
+ elif settings["AUTOCLEAN"] and "yes"==settings["AUTOCLEAN"]:
prompt="Nothing to merge; would you like to auto-clean packages?"
else:
print