summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-08 06:26:30 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-08 06:26:30 +0000
commitf05ff8cd60888a6f9c21931986e2af4f5abf39fb (patch)
tree9a2a36f3643da34cfe5011f3f5f71693bc504373
parent7cdc6575cb5fe4abdff89f1a8680eef7254a2fbd (diff)
downloadportage-f05ff8cd60888a6f9c21931986e2af4f5abf39fb.tar.gz
portage-f05ff8cd60888a6f9c21931986e2af4f5abf39fb.tar.bz2
portage-f05ff8cd60888a6f9c21931986e2af4f5abf39fb.zip
Fix myaction logic so that --resume works (with --pretend) for non-root users.
svn path=/main/trunk/; revision=3095
-rwxr-xr-xbin/emerge7
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index 4c51080fa..24ae8bc04 100755
--- 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: