diff options
author | 2017-06-12 21:21:59 +0200 | |
---|---|---|
committer | 2017-06-13 09:38:11 +0200 | |
commit | f98dd608486183f41495af418df3c6448cc0838c (patch) | |
tree | af0243659e77bb070e5779f6ee6345eea2e825fb /src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java | |
parent | 39f7cff73fa00ae3d71857373fdf84f9d969ad72 (diff) |
Fix the converter type for several build configuration options which take lists
of labels.
Also fix an indent error in BuildTool.
PiperOrigin-RevId: 158747039
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java index dd5b81d58b..821e62b0de 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java @@ -327,16 +327,18 @@ public final class BuildTool { } SupportedEnvironmentsProvider provider = Verify.verifyNotNull(asProvider.getProvider(SupportedEnvironmentsProvider.class)); - Collection<Label> missingEnvironments = ConstraintSemantics.getUnsupportedEnvironments( - provider.getRefinedEnvironments(), expectedEnvironments); - if (!missingEnvironments.isEmpty()) { - throw new ViewCreationFailedException( - String.format("This is a restricted-environment build. %s does not support" - + " required environment%s %s", - topLevelTarget.getLabel(), - missingEnvironments.size() == 1 ? "" : "s", - Joiner.on(", ").join(missingEnvironments))); - } + Collection<Label> missingEnvironments = + ConstraintSemantics.getUnsupportedEnvironments( + provider.getRefinedEnvironments(), expectedEnvironments); + if (!missingEnvironments.isEmpty()) { + throw new ViewCreationFailedException( + String.format( + "This is a restricted-environment build. %s does not support" + + " required environment%s %s", + topLevelTarget.getLabel(), + missingEnvironments.size() == 1 ? "" : "s", + Joiner.on(", ").join(missingEnvironments))); + } } } |