diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2017-04-18 16:42:25 +0200 |
|---|---|---|
| committer | Klaus Aehlig <aehlig@google.com> | 2017-04-19 10:46:33 +0200 |
| commit | 4215114379eebb91ae502f626366873f47af9e4e (patch) | |
| tree | 3947121b67c18567220936058a359403ac5d04ee /src/main | |
| parent | 3a5d3db6436bbaf5351da9ea9c19a41ae7c95ca9 (diff) | |
Revert "Expect the python binary on path to be a symlink "
This reverts commit 1cd2096284959ead26687d1d58b695d2abffb8e2.
That commit tried to find a more suitable python binary by
following symlinks. That, however, is not necessary, as
our follow-up infrastructure can call symbolic links and
our tests os.path.isfile(path) and os.access(path, os.X_OK)
follow symbolic links as well.
Fixes #2836.
Change-Id: If37589622d141265577eb3872f68342ae1c263dc
PiperOrigin-RevId: 153461118
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt | 2 |
1 files changed, 0 insertions, 2 deletions
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 3951f49068..b5afddf116 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 @@ -42,8 +42,6 @@ def SearchPath(name): for directory in search_path: if directory == '': continue path = os.path.join(directory, name) - if os.path.islink(path): - path = os.path.realpath(path) if os.path.isfile(path) and os.access(path, os.X_OK): return path return None |