Skip to content
Snippets Groups Projects
Commit e060f7a6 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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.
parent d5febe1a
No related branches found
No related tags found
No related merge requests found
...@@ -34,8 +34,10 @@ ...@@ -34,8 +34,10 @@
import time import time
import random import random
viewer_dir = os.path.dirname(__file__) viewer_dir = os.path.dirname(__file__)
# add indra/lib/python to our path so we don't have to muck with PYTHONPATH # 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")) # 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 from indra.util.llmanifest import LLManifest, main, proper_windows_path, path_ancestors
try: try:
from llbase import llsd from llbase import llsd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment