summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 034feafb..7abf5271 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)