diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-12-08 02:40:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-08 02:40:52 +0000 |
| commit | 6f1244a648d8dd5a8b15a99ca13ce62f2a5535bc (patch) | |
| tree | a99f83260a38d1094c064899c2091646c4dc6d83 | |
| parent | 000454d4e2982178ef602f11954be5fd3a7ae08e (diff) | |
| download | portage-6f1244a648d8dd5a8b15a99ca13ce62f2a5535bc.tar.gz portage-6f1244a648d8dd5a8b15a99ca13ce62f2a5535bc.tar.bz2 portage-6f1244a648d8dd5a8b15a99ca13ce62f2a5535bc.zip | |
Simplfy deprecated action parsing logic.
svn path=/main/trunk/; revision=5219
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index 5dd4c2018..66030eda6 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4315,13 +4315,10 @@ def parse_opts(tmpcmdline, silent=False): if x not in ["system", "world"]: print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x)) # special case "search" so people can search for action terms, e.g. emerge -s sync - if myaction and myaction != "search": + if myaction: multiple_actions(myaction, x) sys.exit(1) - if myaction != "search": - myaction=x - else: - myfiles.append(x) + myaction = x else: myfiles.append(x) |