Merge pull request #963 from HubSpot/shell_false

also set shell false if pending task cmdLineArgs are set
HubSpot · Mar 22, 2016 · 56a1e39 · 56a1e39
2 parents 5195bec + ca3676a
commit 56a1e39
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...arityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java b/...arityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java
@@ -360,7 +360,8 @@ private void prepareCommand(final TaskInfo.Builder bldr, final SingularityTaskId
     if (task.getDeploy().getArguments().isPresent() ||
         // Hopefully temporary workaround for
         // http://www.mail-archive.com/user@mesos.apache.org/msg01449.html
-        task.getDeploy().getContainerInfo().isPresent()) {
+        task.getDeploy().getContainerInfo().isPresent() ||
+        task.getPendingTask().getCmdLineArgsList().isPresent()) {
       commandBldr.setShell(false);
     }