[ARVADOS] updated: 01cc618477e897423d6144beb082792e06a0e6b6
git at public.curoverse.com
git at public.curoverse.com
Wed Jun 3 23:58:55 EDT 2015
Summary of changes:
services/api/app/models/collection.rb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
via 01cc618477e897423d6144beb082792e06a0e6b6 (commit)
from 5263be21158497b783efe1a4e861ee8bf38faa4c (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 01cc618477e897423d6144beb082792e06a0e6b6
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 3 23:57:58 2015 -0400
6203: add trailing newline character in munge_manifest_locators method only when the original manifest ended with one; one of the unit tests did not like it otherwise.
diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 51ed7ab..4f274dc 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -244,7 +244,13 @@ class Collection < ArvadosModel
end
new_lines << new_words.join(' ')
end
- manifest = new_lines.join("\n")+"\n" if !new_lines.empty?
+
+ if !new_lines.empty?
+ ends_with_newline = manifest.end_with?("\n")
+ manifest = new_lines.join("\n")
+ manifest += "\n" if ends_with_newline
+ end
+
manifest
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list