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

1 files changed, 6 insertions, 2 deletions

diff --git a/bin/emaint b/bin/emaint
index 016c64ea..bff6856f 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():