[ARVADOS] updated: 1.1.4-529-gc425f01b6

[Git user]

Summary of changes:
 services/api/lib/crunch_dispatch.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

       via  c425f01b6dd63dfe5d99a19f57c8155c2f0fb195 (commit)
      from  9a9930cebb7f36131490d0f144e23f5066e7f01d (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 c425f01b6dd63dfe5d99a19f57c8155c2f0fb195
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Jul 2 11:16:19 2018 -0400

    Fix crash in error handler.
    
    fatal: ambiguous argument 'c97qk-8i9sb-nmca4v1scg9910o': unknown revision or path not in the working tree.
    Use '--' to separate paths from revisions, like this:
    'git <command> [<revision>...] -- [<file>...]'
    bundler: failed to load command: ./script/crunch-dispatch.rb (./script/crunch-dispatch.rb)
    NameError: undefined local variable or method `job' for #<CrunchDispatch:0x000000000534bdb8>
      /var/www/arvados-api/current/lib/crunch_dispatch.rb:321:in `tag_commit'
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index 3cabc1e3c..73ad7606c 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -297,7 +297,7 @@ class CrunchDispatch
     @fetched_commits[sha1] = ($? == 0)
   end
 
-  def tag_commit(commit_hash, tag_name)
+  def tag_commit(job, commit_hash, tag_name)
     # @git_tags[T]==V if we know commit V has been tagged T in the
     # arvados_internal repository.
     if not @git_tags[tag_name]
@@ -381,20 +381,20 @@ class CrunchDispatch
           next
         end
         ready &&= get_commit repo.server_path, job.script_version
-        ready &&= tag_commit job.script_version, job.uuid
+        ready &&= tag_commit job, job.script_version, job.uuid
       end
 
       # This should be unnecessary, because API server does it during
       # job create/update, but it's still not a bad idea to verify the
       # tag is correct before starting the job:
-      ready &&= tag_commit job.script_version, job.uuid
+      ready &&= tag_commit job, job.script_version, job.uuid
 
       # The arvados_sdk_version doesn't support use of arbitrary
       # remote URLs, so the requested version isn't necessarily copied
       # into the internal repository yet.
       if job.arvados_sdk_version
         ready &&= get_commit @arvados_repo_path, job.arvados_sdk_version
-        ready &&= tag_commit job.arvados_sdk_version, "#{job.uuid}-arvados-sdk"
+        ready &&= tag_commit job, job.arvados_sdk_version, "#{job.uuid}-arvados-sdk"
       end
 
       if not ready

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


hooks/post-receive
--