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/ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin/ebuild') diff --git a/bin/ebuild b/bin/ebuild index 2d8c0890e..da405db07 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -21,9 +21,13 @@ if "merge" in pargs: os.environ["FEATURES"] = os.environ.get("FEATURES", "") + " -noauto" os.environ["PORTAGE_CALLER"]="ebuild" -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, portage_util, portage_const +import portage_util, portage_const # do this _after_ 'import portage' to prevent unnecessary tracing if debug and "python-trace" in portage.features: -- cgit v1.2.3-1-g7c22