livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Nat Goodspeed 2013-06-27 12:50:06 -04:00
parent d5febe1ab5
commit e060f7a6e5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/viewer_manifest.py
View File

@ -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