[ARVADOS] updated: 854060d1005f013784fe935a4d8bd7ff5fc1c2e3

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/pipeline_instance.rb |  5 +++--
 sdk/cli/bin/crunch-job                         | 15 ---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

       via  854060d1005f013784fe935a4d8bd7ff5fc1c2e3 (commit)
      from  7c8e8d37dd25880627a8faabd56eba888ed194b8 (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 854060d1005f013784fe935a4d8bd7ff5fc1c2e3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Aug 27 15:02:20 2014 -0400

    3342: Handle case in PipelineInstance#friendly_link_name where
    pipeline_template_uuid doesn't return a PipelineTemplate.  Removed unnecessary
    code from crunch-job to calculate md5 hash of manifest_text (API server doesn't
    require md5 hash to be provided with collection creation any more.)

diff --git a/apps/workbench/app/models/pipeline_instance.rb b/apps/workbench/app/models/pipeline_instance.rb
index 9acc849..d0b4dcd 100644
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -8,9 +8,10 @@ class PipelineInstance < ArvadosBase
   def friendly_link_name
     pipeline_name = self.name
     if pipeline_name.nil? or pipeline_name.empty?
-      return PipelineTemplate.where(uuid: self.pipeline_template_uuid).first.name
+      template = PipelineTemplate.where(uuid: self.pipeline_template_uuid).first
+      template.name if template else self.uuid
     else
-      return pipeline_name
+      pipeline_name
     end
   end
 
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 01786ab..41109c1 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -852,21 +852,6 @@ else {
   eval {
     open(my $orig_manifest, '-|', 'arv-get', $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 @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(@stripped_manifest_lines, join(" ", @words));
-    }
-    my $stripped_manifest_text = join("", @stripped_manifest_lines);
     my $output = $arv->{'collections'}->{'create'}->execute('collection' => {
       'manifest_text' => $orig_manifest_text,
     });

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


hooks/post-receive
--