Revert the default choice for --ask --unmerge (bug #158354) because people are compla...

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

diff --git a/bin/emerge b/bin/emerge
index 537f3a255a6cfb51a1d1a275047882cd44562c48..7e201b1c4f95406afd6c3285dea17c23a4f8e0f1 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3225,8 +3225,7 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
                #we're done... return
                return 0
        if "--ask" in myopts:
-               if userquery("Would you like to unmerge these packages?",
-                       responses=["No", "Yes"], colours=[red, green]) == "No":
+               if userquery("Would you like to unmerge these packages?")=="No":
                        # enter pretend mode for correct formatting of results
                        myopts["--pretend"] = True
                        print