Fix myaction logic so that --resume works (with --pretend) for non-root users.

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

diff --git a/bin/emerge b/bin/emerge
index 4c51080fa29f17b81f593d96b331818d9180dcfe..24ae8bc0482f71efd8f3868c4fd940afa0e942df 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -612,12 +612,13 @@ if "--debug" in myopts:
        print "myaction", myaction
        print "myopts", myopts
 
+if not myaction and not myfiles and "--resume" not in myopts:
+       help()
+       sys.exit(1)
+
 # 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 and not myfiles:
-               help()
-               sys.exit(1)
        if "--pretend" not in myopts and \
        myaction not in ("search","info"):
                if portage.secpass >= 1: