[ARVADOS] updated: 5c80d2974917a4f14da471c84923b3f8d721fd1f

[git at public.curoverse.com]

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

       via  5c80d2974917a4f14da471c84923b3f8d721fd1f (commit)
      from  7d838bbf3337b2600fecb93322e6466b9a690a42 (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 5c80d2974917a4f14da471c84923b3f8d721fd1f
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jun 8 10:10:26 2015 -0400

    6203: Accept (and discard) hints in client-provided portable_data_hash.

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 2b47968..17b9572 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -128,8 +128,8 @@ class Collection < ArvadosModel
       true
     elsif portable_data_hash.nil? or not portable_data_hash_changed?
       self.portable_data_hash = computed_pdh
-    elsif portable_data_hash !~ /^[0-9a-f]{32}(\+\d+)?$/
-      errors.add(:portable_data_hash, "is not a valid hash or hash+size")
+    elsif portable_data_hash !~ Keep::Locator::LOCATOR_REGEXP
+      errors.add(:portable_data_hash, "is not a valid locator")
       false
     elsif portable_data_hash[0..31] != computed_pdh[0..31]
       errors.add(:portable_data_hash,

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


hooks/post-receive
--