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/portageq | |
| 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/portageq')
| -rwxr-xr-x | bin/portageq | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/portageq b/bin/portageq index 0424647b..5ee16c4e 100755 --- a/bin/portageq +++ b/bin/portageq @@ -20,7 +20,6 @@ except KeyboardInterrupt: sys.exit(1) import os -sys.path.insert(0, os.environ.get("PORTAGE_PYM_PATH", "/usr/lib/portage/pym")) import types,string @@ -332,7 +331,11 @@ def main(): if uses_root: os.environ["ROOT"] = sys.argv[2] global portage - import portage + try: + import portage + except ImportError: + sys.path.insert(0, "/usr/lib/portage/pym") + import portage if uses_root: sys.argv[2] = portage.root function(sys.argv[2:]) |