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/fixpackages | |
| parent | Just use stat instead of lstat for config protect, so that broken symlinks ar... (diff) | |
| download | portage-multirepo-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.gz portage-multirepo-64396f7e8e3914d66d4b5efb9bfd80c8cd7a72fd.tar.bz2 portage-multirepo-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/fixpackages')
| -rwxr-xr-x | bin/fixpackages | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/fixpackages b/bin/fixpackages index f9d09dec..f7c1bf51 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -5,9 +5,11 @@ import os,sys os.environ["PORTAGE_CALLER"]="fixpackages" -sys.path.insert(0, os.environ.get("PORTAGE_PYM_PATH", "/usr/lib/portage/pym")) - -import portage +try: + import portage +except ImportError: + sys.path.insert(0, "/usr/lib/portage/pym") + import portage mysettings = portage.settings mytrees = portage.db |