[ARVADOS] updated: 73988a7629d8ce151983997aac45c04bb150f8f1

git at public.curoverse.com git at public.curoverse.com
Tue Sep 2 13:56:22 EDT 2014


Summary of changes:
 sdk/cli/bin/crunch-job | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  73988a7629d8ce151983997aac45c04bb150f8f1 (commit)
      from  5b953c11c79e63cbbe0a08037c429f3f7ed0ff13 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 73988a7629d8ce151983997aac45c04bb150f8f1
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Sep 2 13:55:39 2014 -0400

    Do not blow up when running jobs in local mode.
    
    This bug was introduced in a5819ec1e48fba90658fcf676ffc50c1f216d484
    
    no issue #

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 963bf32..0d31afc 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -685,13 +685,13 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
       $command .= "\Q$docker_hash\E ";
       $command .= "stdbuf --output=0 --error=0 ";
-      $command .= "perl - ";
+      $command .= "perl - " if ($build_script);
       $command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};
     } else {
       # Non-docker run
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -poll=10000 ";
       $command .= "stdbuf --output=0 --error=0 ";
-      $command .= "perl - ";
+      $command .= "perl - " if ($build_script);
       $command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
     }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list