[ARVADOS] updated: 416189411a572ca2410c8cfb5f571d1f9b4c1dfd

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

       via  416189411a572ca2410c8cfb5f571d1f9b4c1dfd (commit)
      from  c290dd51011b5f8e156ed4af2f6107cf4309aa48 (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 416189411a572ca2410c8cfb5f571d1f9b4c1dfd
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jun 12 15:14:22 2014 -0400

    2755: Fix handling of stripped/orig manifest text.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 628fea8..e30efd9 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -820,20 +820,22 @@ if ($collated_output)
         or die "failed to get collated manifest: $!";
     # Read the original manifest, and strip permission hints from it,
     # so we can put the result in a Collection.
-    my @manifest_lines = ();
+    my @stripped_manifest_lines = ();
+    my $orig_manifest_text = '';
     while (my $manifest_line = <$orig_manifest>) {
+      $orig_manifest_text .= $manifest_line;
       my @words = split(/ /, $manifest_line, -1);
       foreach my $ii (0..$#words) {
         if ($words[$ii] =~ /^[0-9a-f]{32}\+/) {
           $words[$ii] =~ s/\+A[0-9a-f]{40}@[0-9a-f]{8}\b//;
         }
       }
-      push(@manifest_lines, join(" ", @words));
+      push(@stripped_manifest_lines, join(" ", @words));
     }
-    my $stripped_manifest_text = join("", @manifest_lines);
+    my $stripped_manifest_text = join("", @stripped_manifest_lines);
     my $output = $arv->{'collections'}->{'create'}->execute('collection' => {
       'uuid' => md5_hex($stripped_manifest_text),
-      'manifest_text' => $manifest_text,
+      'manifest_text' => $orig_manifest_text,
     });
     $Job->update_attributes('output' => $output->{uuid});
     if ($Job->{'output_is_persistent'}) {

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


hooks/post-receive
--