Fix a regression in security handling, emerge with no options should print out helpfu...

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

diff --git a/bin/emerge b/bin/emerge
index 95f8660636dff381b50532eca79e9e52168093ca..14519df0fbdd75d6e4424d8df28c603d451300cd 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -614,7 +614,10 @@ 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.
+       # We've already allowed "--version" and "--help" above.y
+       if not myaction:
+               help()
+               sys.exit(0)
        if "--pretend" not in myopts and \
        myaction not in ("search","info"):
                if portage.secpass >= 1: