All packages to be added to the world favorites via --noreplace, even when --ask...

svn path=/main/trunk/; revision=4751

diff --git a/bin/emerge b/bin/emerge
index 938a55f5fa90cabe77c8f1179aed37c055537bac..d68d793bcd9e1b1ae2d48d94fc2915e04186752a 100755 (executable)
--- 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