From f05ff8cd60888a6f9c21931986e2af4f5abf39fb Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 8 Apr 2006 06:26:30 +0000 Subject: Fix myaction logic so that --resume works (with --pretend) for non-root users. svn path=/main/trunk/; revision=3095 --- bin/emerge | 7 ++++--- 1 file 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: -- cgit v1.2.3-1-g7c22