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/regenworld | |
| 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/regenworld')
| -rwxr-xr-x | bin/regenworld | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/regenworld b/bin/regenworld index d5e28dd7..a7428ed9 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -4,8 +4,12 @@ # $Id$ import sys, os -sys.path.insert(0, os.environ.get("PORTAGE_PYM_PATH", "/usr/lib/portage/pym")) -import portage, string, re +try: + import portage +except ImportError: + sys.path.insert(0, "/usr/lib/portage/pym") + import portage +import string, re __candidatematcher__ = re.compile("^[0-9]+: \\*\\*\\* emerge ") __noncandidatematcher__ = re.compile(" sync( |$)| clean( |$)| search( |$)|--oneshot|--fetchonly| unmerge( |$)") |