diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-06-27 12:50:06 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-06-27 12:50:06 -0400 |
| commit | e060f7a6e529d0ef83106db85969a2d047a2247a (patch) | |
| tree | 3c38bd6d82d94d82432784c9085e63c4cb4f59a0 | |
| parent | d5febe1ab553749808198ec4e0c78ec64d4d9588 (diff) | |
CHOP-955, CHOP-957: Prioritize indra.util.llmanifest in same source repo.
It seems that certain build hosts have an (obsolete? broken?) install of
indra.util.llmanifest under the system Python. If we append the local repo
indra/lib/python to sys.path, viewer_manifest.py pulls in the broken
llmanifest. Prepend to sys.path instead to ensure we get the right one.
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index eb2cd73cc9..1429fe4c7a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -34,8 +34,10 @@ import tarfile import time import random viewer_dir = os.path.dirname(__file__) -# add indra/lib/python to our path so we don't have to muck with PYTHONPATH -sys.path.append(os.path.join(viewer_dir, os.pardir, "lib", "python")) +# Add indra/lib/python to our path so we don't have to muck with PYTHONPATH. +# Put it FIRST because some of our build hosts have an ancient install of +# indra.util.llmanifest under their system Python! +sys.path.insert(0, os.path.join(viewer_dir, os.pardir, "lib", "python")) from indra.util.llmanifest import LLManifest, main, proper_windows_path, path_ancestors try: from llbase import llsd |