From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Oct 2006 21:40:32 +0000 (-0000)
Subject: Make --tree not imply --pretend anymore so that people can put it in EMERGE_DEFAULT_OPTS.
X-Git-Tag: v2.1.2~665
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd12affe732544bd22602bd27724f0b3d8653c12;p=portage.git

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 877cc5141..4d0d8b285 100755
--- 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":