diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-10-31 04:23:06 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-10-31 04:23:06 +0000 |
commit | 64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd (patch) | |
tree | 70a47dc3100da9328a1cd40bb5ac49e37c40a756 /bin/dispatch-conf | |
parent | add4ae8be75bd027f51977e601c9af8f1ddb27ee (diff) | |
download | portage-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.gz portage-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.bz2 portage-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/dispatch-conf')
-rwxr-xr-x | bin/dispatch-conf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 277d6ef4b..2309b680f 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -15,9 +15,13 @@ from stat import * from random import * import atexit, commands, os, re, shutil, stat, string, sys -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 from portage_exec import find_binary FIND_EXTANT_CONFIGS = "find '%s' %s -iname '._cfg????_%s'" |