diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2017-10-06 22:04:03 +0200 |
|---|---|---|
| committer | Klaus Aehlig <aehlig@google.com> | 2017-10-07 11:07:08 +0200 |
| commit | 6fbf7a2948969538b9935887ae6fff7b7c998e65 (patch) | |
| tree | 88a36d15d4d6fe2e352db8bf7ab35c188e4f1516 /src/main/java/com/google/devtools | |
| parent | 5370ceb3a86059879add0666aff119053af510a0 (diff) | |
Restrict command search to files
Fixes #3846.
Change-Id: Ic510c539dfe321aa9a679cee7143fee77a17acc5
PiperOrigin-RevId: 171332064
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java index 5038c31f60..dfa72257f8 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java @@ -52,6 +52,7 @@ import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.RootedPath; +import com.google.devtools.build.lib.vfs.Symlinks; import com.google.devtools.build.skyframe.SkyFunction.Environment; import com.google.devtools.build.skyframe.SkyFunctionException.Transience; import com.google.devtools.build.skyframe.SkyKey; @@ -448,7 +449,7 @@ public class SkylarkRepositoryContext { // We ignore relative path as they don't mean much here (relative to where? the workspace // root?). Path path = outputDirectory.getFileSystem().getPath(fragment).getChild(program); - if (path.exists() && path.isExecutable()) { + if (path.exists() && path.isFile(Symlinks.FOLLOW) && path.isExecutable()) { return new SkylarkPath(path); } } |