diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-05 03:59:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-05 03:59:10 +0000 |
| commit | 679fdc9faad7db4ed39b826e83b6aed33f03e574 (patch) | |
| tree | 3acb89045d2f7c4f8532a3adba2ea091ffbe56cf | |
| parent | d3d02a36bfebe8a592eb05ae342898443b2ad6c2 (diff) | |
| download | portage-679fdc9faad7db4ed39b826e83b6aed33f03e574.tar.gz portage-679fdc9faad7db4ed39b826e83b6aed33f03e574.tar.bz2 portage-679fdc9faad7db4ed39b826e83b6aed33f03e574.zip | |
Make --searchdesc imply --search inside parse_opts().
svn path=/main/trunk/; revision=12754
| -rw-r--r-- | pym/_emerge/__init__.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 5600ced6f..f643cc3df 100644 --- 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 |