From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 7 Apr 2006 22:44:34 +0000 (-0000)
Subject: Fix myaction logic (myaction==None is actually valid, regression from r3090).
X-Git-Tag: v2.1_pre8~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a52d8f3e5542489cc1b466c850455d21689fbfdd;p=portage.git

Fix myaction logic (myaction==None is actually valid, regression from r3090).

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

diff --git a/bin/emerge b/bin/emerge
index 67113857e..4c51080fa 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -615,9 +615,9 @@ if "--debug" in myopts:
 # check if root user is the current user for the actions where emerge needs this
 if portage.secpass < 2:
 	# We've already allowed "--version" and "--help" above.
-	if not myaction:
+	if not myaction and not myfiles:
 		help()
-		sys.exit(0)
+		sys.exit(1)
 	if "--pretend" not in myopts and \
 	myaction not in ("search","info"):
 		if portage.secpass >= 1: