summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-09 21:40:32 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-09 21:40:32 +0000
commitbd12affe732544bd22602bd27724f0b3d8653c12 (patch)
tree386b8233b2c26481b6833d3a2aec4d49faa4e1ec
parent654c33f7489407bec3e093853460c522252abaaf (diff)
downloadportage-bd12affe732544bd22602bd27724f0b3d8653c12.tar.gz
portage-bd12affe732544bd22602bd27724f0b3d8653c12.tar.bz2
portage-bd12affe732544bd22602bd27724f0b3d8653c12.zip
Make --tree not imply --pretend anymore so that people can put it in EMERGE_DEFAULT_OPTS.
svn path=/main/trunk/; revision=4642
-rwxr-xr-xbin/emerge5
1 files changed, 0 insertions, 5 deletions
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":