summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-26 07:00:47 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-26 07:00:47 +0000
commitbf83ca7067ccbb9cacc758fea461875298956376 (patch)
tree8483de71524bff91a4ea75904e3b83b81d33f9b9
parent2e8c935fb78beff2f4ebbb16876866be765194ac (diff)
downloadportage-bf83ca7067ccbb9cacc758fea461875298956376.tar.gz
portage-bf83ca7067ccbb9cacc758fea461875298956376.tar.bz2
portage-bf83ca7067ccbb9cacc758fea461875298956376.zip
Allow users in the portage group to fetch. Thanks to truedfx for reporting this regression.
svn path=/main/trunk/; revision=3015
-rwxr-xr-xbin/emerge17
1 files changed, 12 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge
index d705f4a7d..ae85fa9a5 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -611,16 +611,23 @@ if portage.wheelgid == portage.portage_gid:
print "emerge: wheel group use is being deprecated. Please update group and passwd to"
print " include the portage user as noted above, and then use group portage."
+if "--debug" in myopts:
+ print "myaction", myaction
+ print "myopts", 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.
if "--pretend" not in myopts and \
myaction not in ("search","info"):
- if "--debug" in myopts:
- print "myaction",myaction
- print "myopts",myopts
- print "emerge: root access required."
- sys.exit(1)
+ if portage.secpass >= 1:
+ if "--fetchonly" not in myopts and \
+ "--fetch-all-uri" not in myopts:
+ print "emerge: root access required."
+ sys.exit(1)
+ else:
+ print "emerge: root access required."
+ sys.exit(1)
if not "--pretend" in myopts:
emergelog("Started emerge on: "+time.strftime("%b %d, %Y %H:%M:%S", time.localtime()))