[ARVADOS] updated: c67624630594b481aa96d548282187720601abea

git at public.curoverse.com git at public.curoverse.com
Wed Jan 29 14:55:08 EST 2014


Summary of changes:
 services/api/app/models/job.rb |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

       via  c67624630594b481aa96d548282187720601abea (commit)
      from  53f098a4343081d2f31be9b84c11973320532337 (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 c67624630594b481aa96d548282187720601abea
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 29 11:52:59 2014 -0800

    Skip "specified commit exists" validation when updating an existing
    job without modifying script_version.

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 923bd0f..17ca6cb 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -64,11 +64,13 @@ class Job < ArvadosModel
       # instead of a commit-ish.
       return true
     end
-    sha1 = Commit.find_by_commit_ish(self.script_version) rescue nil
-    if sha1
-      self.script_version = sha1
-    else
-      raise ArgumentError.new("Specified script_version does not resolve to a commit")
+    if new_record? or script_version_changed?
+      sha1 = Commit.find_by_commit_ish(self.script_version) rescue nil
+      if sha1
+        self.script_version = sha1
+      else
+        raise ArgumentError.new("Specified script_version does not resolve to a commit")
+      end
     end
   end
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list