summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge7
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)