From 85e306a09766de460717033ae9aac05bc822b6af Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 18 Oct 2006 10:50:50 +0000 Subject: 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 --- bin/emerge | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'bin') 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 -- cgit v1.2.3-1-g7c22