[ARVADOS] updated: 355fe24bf5a4ac9e45372333e8bbc8e39b5b86a1

[Git user]

Summary of changes:
 services/api/app/models/collection.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

       via  355fe24bf5a4ac9e45372333e8bbc8e39b5b86a1 (commit)
      from  dbb0d22a96fa2de606430d78c05c254598f501df (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 355fe24bf5a4ac9e45372333e8bbc8e39b5b86a1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Mar 14 12:03:33 2017 -0400

    8567: If a search_term looks like a PDH, always treat it as one.  Also use
    correct optional parameter syntax.

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 29e5725..6d1a0d5 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -362,7 +362,7 @@ class Collection < ArvadosModel
   # Rails.configuration.docker_image_formats.  Will follow
   # 'docker_image_migration' links if search_term resolves to an incompatible
   # image, but an equivalent compatible image is available.
-  def self.find_all_for_docker_image(search_term, search_tag=nil, readers=nil, filter_compatible_format=true)
+  def self.find_all_for_docker_image(search_term, search_tag=nil, readers=nil, filter_compatible_format: true)
     readers ||= [Thread.current[:user]]
     base_search = Link.
       readable_by(*readers).
@@ -386,9 +386,7 @@ class Collection < ArvadosModel
     if loc = Keep::Locator.parse(search_term)
       loc.strip_hints!
       coll_match = readable_by(*readers).where(portable_data_hash: loc.to_s).limit(1)
-      if compatible_img = get_compatible_images(readers, pattern, coll_match)
-        return compatible_img
-      end
+      return get_compatible_images(readers, pattern, coll_match)
     end
 
     if search_tag.nil? and (n = search_term.index(":"))

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


hooks/post-receive
--