Merge branch 'master' into 3654-combine-selections

[arvados.git] / sdk / cli / bin / arv-run-pipeline-instance

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 5c36a1afb93daf658bf318ff1ff7f01f566e1650..7ce1fa95146dbfdb57069ea94cf364fb1a999d90 100755 (executable)
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -580,11 +580,11 @@ class WhRunPipelineInstance
                   name = c[:output_name] || "Output #{portable_data_hash[0..7]} of #{cname} of #{pipeline_name}"
 
                   # check if there is a name collision.
-                  name_collisions = $arv.collection.list(filters: [["owner_uuid", "=", owner_uuid]
+                  name_collisions = $arv.collection.list(filters: [["owner_uuid", "=", owner_uuid],
                                                                    ["name", "=", name]])[:items]
 
                   newcollection_actual = nil
-                  if name_collisions.any? and name_collisions.first["portable_data_hash"] == portable_data_hash
+                  if name_collisions.any? and name_collisions.first[:portable_data_hash] == portable_data_hash
                     # There is already a collection with the same name and the
                     # same contents, so just point to that.
                     newcollection_actual = name_collisions.first