From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 8 Dec 2006 02:40:52 +0000 (-0000)
Subject: Simplfy deprecated action parsing logic.
X-Git-Tag: v2.1.2~361
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f1244a648d8dd5a8b15a99ca13ce62f2a5535bc;p=portage.git

Simplfy deprecated action parsing logic.

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

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)