summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-29 01:30:26 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-29 01:30:26 +0000
commitd93e81cd32654d55c36499db6cacad5fecebd96d (patch)
tree845a99c99fff54a4af2f5654780153ddd5846714
parentFor bug #164078, don't trigger the CLEAN_DELAY countdown for autoclean operat... (diff)
downloadportage-multirepo-d93e81cd32654d55c36499db6cacad5fecebd96d.tar.gz
portage-multirepo-d93e81cd32654d55c36499db6cacad5fecebd96d.tar.bz2
portage-multirepo-d93e81cd32654d55c36499db6cacad5fecebd96d.zip
Catch EACCESS when running env-update, orignal patch by <phajdan.jr@gmail.com> (bug #106061) (trunk r5802:5803 and r5813:5814)
svn path=/main/branches/2.1.2/; revision=5829
-rwxr-xr-xbin/env-update11
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/env-update b/bin/env-update
index b245b399..69daaca8 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-import os,sys
+import os, sys, errno
def usage(status):
print "Usage: env-update [--no-ldconfig]"
@@ -28,4 +28,11 @@ try:
except ImportError:
sys.path.insert(0, "/usr/lib/portage/pym")
import portage
-portage.env_update(makelinks)
+try:
+ portage.env_update(makelinks)
+except IOError, e:
+ if e.errno == errno.EACCES:
+ print "env-update: Need superuser access"
+ sys.exit(1)
+ else:
+ raise