Chromium Code Reviews| 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 |
|
Nico
2015/08/31 17:35:23
This looks like a good change, but maybe it should
|
| if __name__ == '__main__': |
| sys.exit(gyp.script_main()) |