From 79c1b8b04641c93a985e0d6d359e2d5eca0aa795 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 27 Jan 2007 01:39:26 +0000 Subject: [PATCH] For consistency, do not imply --pretend with --changelog since that prevents --changelog from being usable in EMERGE_DEFAULTS_OPTS. Thanks to Ryan Hill in #151250. svn path=/main/trunk/; revision=5790 --- bin/emerge | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bin/emerge b/bin/emerge index f4074e28b..e4100b73b 100755 --- 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." -- 2.26.2