diff options
author | dannark <dannark@google.com> | 2018-06-27 13:35:04 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-27 13:36:25 -0700 |
commit | 90e2b4b5e745fe2de9ca82bc8163c198e5be8ca9 (patch) | |
tree | f827defac036acf55c4253c01f11126e0c502572 /src/main/java/com/google/devtools/build/lib/rules/repository | |
parent | 116971c08caa3f9bd94fc91066cd4cd1e432cafe (diff) |
Automated refactor of Label.parseAbsolute() to always pass a repository mapping
RELNOTES: None
PiperOrigin-RevId: 202360925
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/repository')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryFileHandler.java | 3 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryFileHandler.java b/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryFileHandler.java index 5e3e92f0ac..b1c809da7e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryFileHandler.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryFileHandler.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.rules.repository; +import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.FileValue; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; @@ -183,7 +184,7 @@ public class NewRepositoryFileHandler { Label label; try { // Parse a label - label = Label.parseAbsolute(getFileAttributeValue(rule)); + label = Label.parseAbsolute(getFileAttributeValue(rule), ImmutableMap.of()); } catch (LabelSyntaxException ex) { throw new RepositoryFunctionException( new EvalException( diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java index c5e6d03c29..bf3a52a7d5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.rules.repository; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.io.BaseEncoding; import com.google.devtools.build.lib.actions.FileStateValue.RegularFileStateValue; import com.google.devtools.build.lib.actions.FileValue; @@ -206,7 +207,7 @@ public abstract class RepositoryFunction { RootedPath rootedPath; String fileKey = key.substring(5); if (LabelValidator.isAbsolute(fileKey)) { - rootedPath = getRootedPathFromLabel(Label.parseAbsolute(fileKey), env); + rootedPath = getRootedPathFromLabel(Label.parseAbsolute(fileKey, ImmutableMap.of()), env); } else { // TODO(pcloudy): Removing checking absolute path, they should all be absolute label. PathFragment filePathFragment = PathFragment.create(fileKey); |