[ARVADOS] updated: 9b16ff9eb231584fcfda5eed029b1c1b08a0b819

[git at public.curoverse.com]

Summary of changes:
 services/api/app/controllers/arvados/v1/jobs_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  9b16ff9eb231584fcfda5eed029b1c1b08a0b819 (commit)
      from  74cdb4454d4adc6b403c207169313f37332d8aac (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 9b16ff9eb231584fcfda5eed029b1c1b08a0b819
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Oct 1 14:23:21 2014 -0400

    Use job state field instead of running/success columns. refs #3898

diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index b157de4..2a12395 100644
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -65,9 +65,9 @@ class Arvados::V1::JobsController < ApplicationController
       incomplete_job = nil
       @objects.each do |j|
         if j.nondeterministic != true and
-            ((j.success == true and j.output != nil) or j.running == true) and
+            ["Queued", "Running", "Complete"].include?(j.state) and
             j.script_parameters == resource_attrs[:script_parameters]
-          if j.running && j.owner_uuid == current_user.uuid
+          if j.state != "Complete" && j.owner_uuid == current_user.uuid
             # We'll use this if we don't find a job that has completed
             incomplete_job ||= j
           else

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


hooks/post-receive
--