[ARVADOS] updated: dc97d8812b5f793c50e15b60fae66464690b9b41

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_tables.html.erb |    2 +-
 services/api/script/crunch-dispatch.rb          |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

       via  dc97d8812b5f793c50e15b60fae66464690b9b41 (commit)
       via  db6cfb21fd49c09d46aca5b1e340125d0765812c (commit)
      from  62944c5d504765d57756c133cfb17186ca66eda5 (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 dc97d8812b5f793c50e15b60fae66464690b9b41
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Mar 7 13:37:03 2014 -0500

    Fix check for crunch-job missing from path, and run it as arv-crunch-job.

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 59ea162..ecc7f5d 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -144,16 +144,17 @@ class Dispatcher
             api_client_id: 0)
       job_auth.save
 
-      cmd_args << (ENV['CRUNCH_JOB_BIN'] || `which crunch-job`.strip)
+      crunch_job_bin = (ENV['CRUNCH_JOB_BIN'] || `which arv-crunch-job`.strip)
+      if crunch_job_bin == ''
+        raise "No CRUNCH_JOB_BIN env var, and crunch-job not in path."
+      end
+
+      cmd_args << crunch_job_bin
       cmd_args << '--job-api-token'
       cmd_args << job_auth.api_token
       cmd_args << '--job'
       cmd_args << job.uuid
 
-      if cmd_args[0] == ''
-        raise "No CRUNCH_JOB_BIN env var, and crunch-job not in path."
-      end
-
       commit = Commit.where(sha1: job.script_version).first
       if commit
         cmd_args << '--git-dir'

commit db6cfb21fd49c09d46aca5b1e340125d0765812c
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Mar 7 13:31:59 2014 -0500

    Fix crash when job script is nil.

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index 320f32c..1592632 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -27,7 +27,7 @@
           <tr>
             <td>
               <small>
-		<%= link_to j.script[0..31], job_path(j.uuid) %>
+		<%= link_to((j.script.andand[0..31] || j.uuid), job_path(j.uuid)) %>
               </small>
             </td>
 

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


hooks/post-receive
--