diff options
| author | Alec Warner <antarus@gentoo.org> | 2006-04-07 19:02:43 +0000 |
|---|---|---|
| committer | Alec Warner <antarus@gentoo.org> | 2006-04-07 19:02:43 +0000 |
| commit | c52587d165fb6511e36d0e4619fbe5211e2a1cf1 (patch) | |
| tree | 7ebf4815cc9387cbe42162dfd5808c41b1640ffa /bin/emerge | |
| parent | db97f5cbf00b18f9389f6f8566e51299f66643fd (diff) | |
| download | portage-c52587d165fb6511e36d0e4619fbe5211e2a1cf1.tar.gz portage-c52587d165fb6511e36d0e4619fbe5211e2a1cf1.tar.bz2 portage-c52587d165fb6511e36d0e4619fbe5211e2a1cf1.zip | |
Fix a regression in security handling, emerge with no options should print out helpful information, not tell you you need to be root ;)
svn path=/main/trunk/; revision=3090
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 95f866063..14519df0f 100755 --- 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: |