[ARVADOS] updated: 1fc256cee80eef7aa2178789f23a729ba9f27b79

[git at public.curoverse.com]

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

       via  1fc256cee80eef7aa2178789f23a729ba9f27b79 (commit)
      from  d6478bb286c0bb1e7b8af67fb4800db792200022 (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 1fc256cee80eef7aa2178789f23a729ba9f27b79
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 22 19:25:04 2014 -0400

    Revert "Bugfix: do not try to overwrite docker_image_locator if it is already set." refs #3898
    
    This reverts commit 7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64.

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 64ae37b..b4aa625 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -134,8 +134,6 @@ 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
--