For consistency, do not imply --pretend with --changelog since that prevents --change...

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

diff --git a/bin/emerge b/bin/emerge
index f4074e28bc32e679da87402f01fd230bbb012906..e4100b73b0d85b0e8463777f9586cd938fa7129e 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -5148,11 +5148,6 @@ def emerge_main():
        if ("--usepkgonly" in myopts) and not ("--usepkg" in myopts):
                myopts["--usepkg"] = True
 
-       # 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["--pretend"] = True
-
        # Allow -p to remove --ask
        if ("--pretend" in myopts) and ("--ask" in myopts):
                print ">>> --pretend disables --ask... removing --ask from options."