summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2006-12-08 01:51:34 +0000
committerMarius Mauch <genone@gentoo.org>2006-12-08 01:51:34 +0000
commit3c98c0138c9e9bb0512e98a362335f82d55e8a90 (patch)
tree39651df03ad7dc9a88d84ba882ae94f5e488c727 /bin/emerge
parent455c4fc6b0c9d77b4d6e303a9b13d17820153754 (diff)
downloadportage-3c98c0138c9e9bb0512e98a362335f82d55e8a90.tar.gz
portage-3c98c0138c9e9bb0512e98a362335f82d55e8a90.tar.bz2
portage-3c98c0138c9e9bb0512e98a362335f82d55e8a90.zip
Allow searching for action terms again
svn path=/main/trunk/; revision=5216
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge8
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 034feafb9..7abf52714 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4314,10 +4314,14 @@ def parse_opts(tmpcmdline, silent=False):
if x in actions:
if x not in ["system", "world"]:
print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x))
- if myaction:
+ # special case "search" so people can search for action terms, e.g. emerge -s sync
+ if myaction and myaction != "search":
multiple_actions(myaction, x)
sys.exit(1)
- myaction=x
+ if myaction != "search":
+ myaction=x
+ else:
+ myfiles.append(x)
else:
myfiles.append(x)