[ARVADOS] updated: d68db5e4755eb38482f251fec92fa975feae667d

git at public.curoverse.com git at public.curoverse.com
Fri Aug 22 16:10:47 EDT 2014


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

       via  d68db5e4755eb38482f251fec92fa975feae667d (commit)
      from  db88e7487f1fca50e00c5fc004e67b922a41ad29 (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 d68db5e4755eb38482f251fec92fa975feae667d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Aug 22 16:10:42 2014 -0400

    Reject empty fields in job creation filters. no issue #

diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index 6977829..a98ca71 100644
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -34,7 +34,7 @@ class Arvados::V1::JobsController < ApplicationController
            ["script_version", "in git",
             params[:minimum_script_version] || resource_attrs[:script_version]],
            ["script_version", "not in git", params[:exclude_script_versions]],
-          ].reject { |filter| filter.last.nil? }
+          ].reject { |filter| filter.last.nil? or filter.last.empty? }
         if image_search = resource_attrs[:runtime_constraints].andand["docker_image"]
           if image_tag = resource_attrs[:runtime_constraints]["docker_image_tag"]
             image_search += ":#{image_tag}"
@@ -238,7 +238,7 @@ class Arvados::V1::JobsController < ApplicationController
       if version_range.nil?
         raise ArgumentError.
           new(["error searching #{script_info['repository']} from",
-               "#{script_range['min_version']} to #{last_version},",
+               "'#{script_range['min_version']}' to '#{last_version}',",
                "excluding #{script_range['exclude_versions']}"].join(" "))
       end
       @filters.append(["script_version", "in", version_range])

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list