From 64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 31 Oct 2006 04:23:06 +0000 Subject: 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 --- bin/dispatch-conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin/dispatch-conf') 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'" -- cgit v1.2.3-1-g7c22