[ARVADOS] updated: 7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/job.rb | 2 ++
 1 file changed, 2 insertions(+)

       via  7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64 (commit)
      from  96e711607984bd74a682dd3f3819dbc453a6591b (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 7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Sep 19 22:28:37 2014 -0400

    Bugfix: do not try to overwrite docker_image_locator if it is already set.
    
    refs #3898

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index b4aa625..64ae37b 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -134,6 +134,8 @@ class Job < ArvadosModel
   end
 
   def find_docker_image_locator
+    # Do nothing if docker_image_locator is already set
+    return true if not self.docker_image_locator.nil?
     # Find the Collection that holds the Docker image specified in the
     # runtime constraints, and store its locator in docker_image_locator.
     unless runtime_constraints.is_a? Hash

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


hooks/post-receive
--