projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11469-volume-tmp' refs #11469
[arvados.git]
/
services
/
api
/
lib
/
salvage_collection.rb
diff --git
a/services/api/lib/salvage_collection.rb
b/services/api/lib/salvage_collection.rb
index 2011f812d5ccf8e3836394acafd50d14ef58f7ec..c6664b1ec916413fc3d2e431bb12551a303bf1ed 100755
(executable)
--- a/
services/api/lib/salvage_collection.rb
+++ b/
services/api/lib/salvage_collection.rb
@@
-29,7
+29,7
@@
module SalvageCollection
def salvage_collection_locator_data manifest
locators = []
size = 0
def salvage_collection_locator_data manifest
locators = []
size = 0
- manifest.scan
/(^|[^[:xdigit:]])([[:xdigit:]]{32})((\+\d+)(\+|\b))?/
do |_, hash, _, sizehint, _|
+ manifest.scan
(/(^|[^[:xdigit:]])([[:xdigit:]]{32})((\+\d+)(\+|\b))?/)
do |_, hash, _, sizehint, _|
if sizehint
locators << hash.downcase + sizehint
size += sizehint.to_i
if sizehint
locators << hash.downcase + sizehint
size += sizehint.to_i