From 7093b97ec3f332016822ed154e81bd86bc7ca645 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Mon, 2 May 2016 09:18:15 +0000 Subject: stub_template.txt: replace A if condition else B statement with if statement Python version priors to 2.5 doesn't support ternary conditional operator. -- MOS_MIGRATED_REVID=121256017 --- .../devtools/build/lib/bazel/rules/python/stub_template.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib') diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt index bdce83eebe..594e534859 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt @@ -63,7 +63,9 @@ def Main(): stub_filename = os.path.join(os.path.dirname(stub_filename), link) continue - runfiles_pattern = "(.*\.runfiles)\\.*" if IsWindows() else "(.*\.runfiles)/.*" + runfiles_pattern = "(.*\.runfiles)/.*" + if IsWindows(): + runfiles_pattern = "(.*\.runfiles)\\.*" matchobj = re.match(runfiles_pattern, os.path.abspath(sys.argv[0])) if matchobj: module_space = matchobj.group(1) @@ -87,7 +89,9 @@ def Main(): python_path_entries += repositories old_python_path = os.environ.get('PYTHONPATH') - separator = ';' if IsWindows() else ':' + separator = ':' + if IsWindows(): + separator = ';' python_path = separator.join(python_path_entries) if old_python_path: python_path += separator + old_python_path -- cgit v1.2.3