diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2018-02-09 06:54:21 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-09 06:57:52 -0800 |
| commit | 220d650b3f47712a5b82748141f3381075c35c80 (patch) | |
| tree | 3b3110a751932f6511381bcf41f2acdc6136290a /src/main/java/com/google/devtools/build | |
| parent | 037c9dcf873e8037f7e6a03d4e4c6230dd5a1b27 (diff) | |
distdir: also accept relative path
...and interpret them relative to the workspace directory.
Change-Id: I31a0ce3a179356c798f00c4218ddd22e16b256a3
PiperOrigin-RevId: 185136432
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java index d535867c81..4d2c0328bd 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java @@ -218,7 +218,11 @@ public class BazelRepositoryModule extends BlazeModule { repoOptions .experimentalDistdir .stream() - .map(filesystem::getPath) + .map( + path -> + path.isAbsolute() + ? filesystem.getPath(path) + : env.getBlazeWorkspace().getWorkspace().getRelative(path)) .collect(Collectors.toList())); } |