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 67113857e5ac49c00df4798c19687da5362ceadc..4c51080fa29f17b81f593d96b331818d9180dcfe 100755 (executable)
--- 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: