Make --tree not imply --pretend anymore so that people can put it in EMERGE_DEFAULT_OPTS.

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

diff --git a/bin/emerge b/bin/emerge
index 877cc51415d3105b7f6fe6bbfa7d4cfeb0a8fbb7..4d0d8b285bca7a071734ccf68e1a81c2f02df64c 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4037,11 +4037,6 @@ def emerge_main():
                if "--buildpkg" not in myopts:
                        myopts["--buildpkg"] = True
 
-       # --tree only makes sense with --pretend
-       if "--tree" in myopts and not (("--pretend" in myopts) or ("--ask" in myopts)):
-               print ">>> --tree implies --pretend... adding --pretend to options."
-               myopts["--pretend"] = True
-
        # Also allow -S to invoke search action (-sS)
        if ("--searchdesc" in myopts):
                if myaction and myaction != "search":