[ARVADOS] updated: 3630931ac1ec775014bbcfb0f09d0d77cd289b7f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/pipeline_instance.rb | 6 +++++-
 sdk/cli/bin/crunch-job                         | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

       via  3630931ac1ec775014bbcfb0f09d0d77cd289b7f (commit)
      from  854060d1005f013784fe935a4d8bd7ff5fc1c2e3 (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 3630931ac1ec775014bbcfb0f09d0d77cd289b7f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Aug 27 17:03:58 2014 -0400

    3342: Fix syntax error in pipeline_instance.rb.  Restore code in crunch-job
    that reads manifest text from arv-get pipe.

diff --git a/apps/workbench/app/models/pipeline_instance.rb b/apps/workbench/app/models/pipeline_instance.rb
index d0b4dcd..e334846 100644
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -9,7 +9,11 @@ class PipelineInstance < ArvadosBase
     pipeline_name = self.name
     if pipeline_name.nil? or pipeline_name.empty?
       template = PipelineTemplate.where(uuid: self.pipeline_template_uuid).first
-      template.name if template else self.uuid
+      if template
+        template.name
+      else
+        self.uuid
+      end
     else
       pipeline_name
     end
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 41109c1..b52d8c6 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -852,6 +852,10 @@ else {
   eval {
     open(my $orig_manifest, '-|', 'arv-get', $collated_output)
         or die "failed to get collated manifest: $!";
+    my $orig_manifest_text = '';
+    while (my $manifest_line = <$orig_manifest>) {
+      $orig_manifest_text .= $manifest_line;
+    }
     my $output = $arv->{'collections'}->{'create'}->execute('collection' => {
       'manifest_text' => $orig_manifest_text,
     });

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


hooks/post-receive
--