From 64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
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/repoman | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'bin/repoman')

diff --git a/bin/repoman b/bin/repoman
index c05ae9e40..4e8f7fc14 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -11,7 +11,6 @@ import errno, os, shutil, sys
 if not hasattr(__builtins__, "set"):
 	from sets import Set as set
 exename=os.path.basename(sys.argv[0])	
-sys.path.insert(0, os.environ.get("PORTAGE_PYM_PATH", "/usr/lib/portage/pym"))
 version="1.2"	
 
 allowed_filename_chars="a-zA-Z0-9._-+:"
@@ -24,7 +23,11 @@ map(allowed_filename_chars_set.setdefault, map(chr, map(ord, [".", "-", "_", "+"
 import string,signal,re,pickle,tempfile
 
 os.environ["PORTAGE_LEGACY_GLOBALS"] = "false"
-import portage
+try:
+	import portage
+except ImportError:
+	sys.path.insert(0, "/usr/lib/portage/pym")
+	import portage
 del os.environ["PORTAGE_LEGACY_GLOBALS"]
 
 import portage_checksum
-- 
cgit v1.2.3-1-g7c22