Make --searchdesc imply --search inside parse_opts().

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 5600ced6f0a7b99059f56570293312eeeff1a266..f643cc3df5d0c6501cf9f89fe8a3f0314fd230e7 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -14785,6 +14785,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:
@@ -15379,14 +15382,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