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/emaint | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin/emaint') diff --git a/bin/emaint b/bin/emaint index 016c64ea4..bff6856f8 100755 --- a/bin/emaint +++ b/bin/emaint @@ -1,12 +1,16 @@ #!/usr/bin/python -O import sys, os -sys.path.insert(0, os.environ.get("PORTAGE_PYM_PATH", "/usr/lib/portage/pym")) from optparse import OptionParser, OptionValueError import re +try: + import portage +except ImportError: + sys.path.insert(0, "/usr/lib/portage/pym") + import portage -import os, portage, portage_const, portage_exception +import portage_const, portage_exception class WorldHandler(object): def name(): -- cgit v1.2.3-1-g7c22