From c52587d165fb6511e36d0e4619fbe5211e2a1cf1 Mon Sep 17 00:00:00 2001 From: Alec Warner Date: Fri, 7 Apr 2006 19:02:43 +0000 Subject: 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 --- bin/emerge | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3-1-g7c22