Index: gm/rebaseline_server/fix_pythonpath.py |
diff --git a/gm/rebaseline_server/fix_pythonpath.py b/gm/rebaseline_server/fix_pythonpath.py |
index ed578ced1017a2047c4929b3267b4c1a052d2a74..cc32f4a6bcf3fa075ac3534a85e06c60ca4347ad 100755 |
--- a/gm/rebaseline_server/fix_pythonpath.py |
+++ b/gm/rebaseline_server/fix_pythonpath.py |
@@ -6,16 +6,15 @@ Copyright 2014 Google Inc. |
Use of this source code is governed by a BSD-style license that can be |
found in the LICENSE file. |
-Adds [trunk]/gm and [trunk]/tools to PYTHONPATH, if they aren't already there. |
+Adds possibly-needed directories to PYTHONPATH, if they aren't already there. |
""" |
import os |
import sys |
-TRUNK_DIRECTORY = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) |
-GM_DIRECTORY = os.path.join(TRUNK_DIRECTORY, 'gm') |
-TOOLS_DIRECTORY = os.path.join(TRUNK_DIRECTORY, 'tools') |
-if GM_DIRECTORY not in sys.path: |
- sys.path.append(GM_DIRECTORY) |
-if TOOLS_DIRECTORY not in sys.path: |
- sys.path.append(TOOLS_DIRECTORY) |
+TRUNK_DIRECTORY = os.path.abspath(os.path.join( |
+ os.path.dirname(__file__), os.pardir, os.pardir)) |
+for subdir in ['common', 'gm', 'tools']: |
+ fullpath = os.path.join(TRUNK_DIRECTORY, subdir) |
+ if fullpath not in sys.path: |
+ sys.path.append(fullpath) |