diff options
| author |  cparsons <cparsons@google.com> | 2018-08-15 11:37:05 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-15 11:39:03 -0700 |
| commit | 3c82bfe03d578d521c957613239f49604d431946 (patch) | |
| tree | ead12fdef9f48d6a9d813730fba7c060381eb35d /src/main | |
| parent | 9395d11c2fd14cdc4293ef11f3b30516267a3eb1 (diff) | |
Remove the 3-arg minimum on shell actions
RELNOTES: None.
PiperOrigin-RevId: 208855272
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index ce9eeeeb03..7a6d05fa00 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.analysis.actions; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CharMatcher; +import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -306,7 +307,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie failMessage = "error executing shell command: " + "'" - + truncate(Iterables.get(getArguments(), 2), 200) + + truncate(Joiner.on(" ").join(getArguments()), 200) + "'"; } catch (CommandLineExpansionException commandLineExpansionException) { failMessage = diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java index 90343eba5d..72e2a5f802 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java @@ -290,9 +290,7 @@ public class SkylarkActionFactory implements SkylarkActionFactoryApi { } } else if (commandUnchecked instanceof SkylarkList) { SkylarkList commandList = (SkylarkList) commandUnchecked; - if (commandList.size() < 3) { - throw new EvalException(null, "'command' list has to be of size at least 3"); - } + @SuppressWarnings("unchecked") List<String> command = commandList.getContents(String.class, "command"); builder.setShellCommand(command); |