[ARVADOS] updated: 3055130be14ab26d68fd1c01a934870855ecbd5c
git at public.curoverse.com
git at public.curoverse.com
Fri Jan 17 10:31:52 EST 2014
Summary of changes:
services/api/app/models/collection.rb | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
via 3055130be14ab26d68fd1c01a934870855ecbd5c (commit)
from ff5069a59469791a973f3b2c3ca13e52bcd7b91e (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 3055130be14ab26d68fd1c01a934870855ecbd5c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Jan 17 10:32:33 2014 -0500
Fixed spaces in manifest stream names. Refs #1849.
diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 9951044..863e2cb 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -63,6 +63,14 @@ class Collection < ArvadosModel
@files = []
manifest_text.split("\n").each do |stream|
toks = stream.split(" ")
+
+ stream = toks[0].gsub /\\(\\|[0-7]{3})/ do |escape_sequence|
+ case $1
+ when '\\' '\\'
+ else $1.to_i(8).chr
+ end
+ end
+
toks[1..-1].each do |tok|
if (re = tok.match /^[0-9a-f]{32}/)
blocksize = nil
@@ -84,7 +92,7 @@ class Collection < ArvadosModel
else $1.to_i(8).chr
end
end
- @files << [toks[0], filename, re[2].to_i]
+ @files << [stream, filename, re[2].to_i]
end
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list