[patch] ask_vs_changelog.patch

ask_vs_changelog.patch (text/plain), 599 bytes, created by TGL on 2004-02-11 14:47:24 UTC

--- bin/emerge.orig	2004-02-01 23:57:53.000000000 +0100
+++ bin/emerge	2004-02-02 22:54:57.345675885 +0100
@@ -197,8 +197,8 @@
 	print ">>> --upgradeonly implies --update... adding --update to options."
 	myopts.append("--update")
 
-# Also allow -l to apply --pretend/-p
-if ("--changelog" in myopts) and not ("--pretend" in myopts):
+# Also allow -l to apply --pretend/-p, but if already in --ask mode
+if ("--changelog" in myopts) and not (("--pretend" in myopts) or ("--ask" in myopts)):
 	print ">>> --changelog implies --pretend... adding --pretend to options."
 	myopts.append("--pretend")