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, 5 insertions, 2 deletions

diff --git a/bin/xpak b/bin/xpak
index 1a0743773..8dcbf145c 100755
--- a/bin/xpak
+++ b/bin/xpak
@@ -8,7 +8,10 @@ if len(sys.argv)!=3:
 	print "xpak: expecting three arguments."
 	sys.exit(1)
 
-sys.path.insert(0, os.environ.get("PORTAGE_PYM_PATH", "/usr/lib/portage/pym"))
+try:
+	import xpak
+except ImportError:
+	sys.path.insert(0, "/usr/lib/portage/pym")
+	import xpak
 
-import xpak
 xpak.xpak(sys.argv[1],sys.argv[2])