diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-10-31 04:23:06 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-10-31 04:23:06 +0000 |
commit | 64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd (patch) | |
tree | 70a47dc3100da9328a1cd40bb5ac49e37c40a756 /bin/repoman | |
parent | add4ae8be75bd027f51977e601c9af8f1ddb27ee (diff) | |
download | portage-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.gz portage-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.bz2 portage-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.zip |
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
Diffstat (limited to 'bin/repoman')
-rwxr-xr-x | bin/repoman | 7 |
1 files changed, 5 insertions, 2 deletions
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 |