summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-18 10:50:50 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-18 10:50:50 +0000
commit85e306a09766de460717033ae9aac05bc822b6af (patch)
treeeea542703a6ff2ee7489f59c8dbb7e689ab368fe
parentc5ea84851330ff931f7a5849ea86f990f47350f3 (diff)
downloadportage-85e306a09766de460717033ae9aac05bc822b6af.tar.gz
portage-85e306a09766de460717033ae9aac05bc822b6af.tar.bz2
portage-85e306a09766de460717033ae9aac05bc822b6af.zip
All packages to be added to the world favorites via --noreplace, even when --ask is enabled. Thanks to leio for reporting this issue.
svn path=/main/trunk/; revision=4751
-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