From a2428c1adadde5412db632afec2f8626f33835fe Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 06:39:10 +0000 Subject: Make --searchdesc imply --search inside parse_opts(). (trunk r12754) svn path=/main/branches/2.1.6/; revision=13002 --- pym/_emerge/__init__.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c03d804e1..9fe8ddcb2 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -14430,6 +14430,9 @@ def parse_opts(tmpcmdline, silent=False): if v is not None: myopts[myopt] = v + if myoptions.searchdesc: + myoptions.search = True + for action_opt in actions: v = getattr(myoptions, action_opt.replace("-", "_")) if v: @@ -14888,14 +14891,6 @@ def emerge_main(): if "--buildpkg" not in myopts: myopts["--buildpkg"] = True - # Also allow -S to invoke search action (-sS) - if ("--searchdesc" in myopts): - if myaction and myaction != "search": - myfiles.append(myaction) - if "--search" not in myopts: - myopts["--search"] = True - myaction = "search" - # Always try and fetch binary packages if FEATURES=getbinpkg if ("getbinpkg" in settings.features): myopts["--getbinpkg"] = True -- cgit v1.2.3-1-g7c22