[ARVADOS] updated: 1.2.0-316-g50288d61c

[Git user]

Summary of changes:
 services/api/app/models/container.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  50288d61c8654a87053a2b3492672cf7d8d71930 (commit)
      from  f248b7a50b38ed288e39a72dfb8e94f475cda76e (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 50288d61c8654a87053a2b3492672cf7d8d71930
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu Nov 8 17:53:09 2018 -0300

    14323: Only get collection mount by UUID when PDH is missing and UUID provided.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 38c4ba6c7..ac67040ed 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -226,7 +226,7 @@ class Container < ArvadosModel
 
       uuid = mount.delete 'uuid'
 
-      if mount['portable_data_hash'].nil?
+      if mount['portable_data_hash'].nil? and !uuid.nil?
         # PDH not supplied, try by UUID
         c = Collection.
           readable_by(current_user).

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


hooks/post-receive
--