summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-07 22:44:34 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-07 22:44:34 +0000
commita52d8f3e5542489cc1b466c850455d21689fbfdd (patch)
tree1e78cbd0c6ceea00b4688a19c905480e65aa8c08
parent24458c86b665e409117bf49fa7cfae34890a6e8f (diff)
downloadportage-a52d8f3e5542489cc1b466c850455d21689fbfdd.tar.gz
portage-a52d8f3e5542489cc1b466c850455d21689fbfdd.tar.bz2
portage-a52d8f3e5542489cc1b466c850455d21689fbfdd.zip
Fix myaction logic (myaction==None is actually valid, regression from r3090).
svn path=/main/trunk/; revision=3093
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
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: