summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-31 04:23:06 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-31 04:23:06 +0000
commit64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd (patch)
tree70a47dc3100da9328a1cd40bb5ac49e37c40a756 /bin/archive-conf
parentJust use stat instead of lstat for config protect, so that broken symlinks ar... (diff)
downloadportage-multirepo-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.gz
portage-multirepo-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.bz2
portage-multirepo-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.zip
Rely on PYTHONPATH instead of PORTAGE_PYM_PATH for locating portage's python modules, then fall back to an explicit sys.path insertion if an ImportError occurs.
svn path=/main/trunk/; revision=4884
Diffstat (limited to 'bin/archive-conf')
-rwxr-xr-xbin/archive-conf8
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/archive-conf b/bin/archive-conf
index 0417e97c..b3d17cc6 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -11,9 +11,13 @@
#
import os, sys, string
-sys.path.insert(0, os.environ.get("PORTAGE_PYM_PATH", "/usr/lib/portage/pym"))
+try:
+ import portage
+except ImportError:
+ sys.path.insert(0, "/usr/lib/portage/pym")
+ import portage
-import portage, dispatch_conf
+import dispatch_conf
FIND_EXTANT_CONTENTS = "find %s -name CONTENTS"