Simplfy deprecated action parsing logic.

svn path=/main/trunk/; revision=5219

diff --git a/bin/emerge b/bin/emerge
index 5dd4c2018dde4cdaa60159d3298064531b5dd638..66030eda68fd8c971aadbcf9103b57215acf6803 100755 (executable)
--- 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)