Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: gyp_main.py

Issue 1313553008: Inject pylib first in the path. This ensures that test load the version (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/small/gyptest-small.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp_main.py
diff --git a/gyp_main.py b/gyp_main.py
index 4ec872f0f95aa3840967f8951e7e6448477e7d64..25a6eba94aae7d09d93d04f129e54c103255f088 100755
--- a/gyp_main.py
+++ b/gyp_main.py
@@ -4,15 +4,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import os
import sys
-# TODO(mark): sys.path manipulation is some temporary testing stuff.
-try:
- import gyp
-except ImportError, e:
- import os.path
- sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), 'pylib'))
- import gyp
+# Make sure we're using the version of pylib in this repo, not one installed
+# elsewhere on the system.
+sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), 'pylib'))
+import gyp
if __name__ == '__main__':
sys.exit(gyp.script_main())
« no previous file with comments | « no previous file | test/small/gyptest-small.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698