fix job output hash key

[arvados.git] / services / crunch / crunch-job

diff --git a/services/crunch/crunch-job b/services/crunch/crunch-job
index 29ee98d355e1194508ce421e6df30649cd462654..70acfef37ab8b8a8f323bc8b06ed08a6fa74bf33 100755 (executable)
--- a/services/crunch/crunch-job
+++ b/services/crunch/crunch-job
@@ -688,8 +688,8 @@ if ($Job->{'output'})
 {
   $arv->{'collections'}->{'create'}->execute('collection' => {
     'uuid' => $Job->{'output'},
-    'manifest_text' => system("whget", $Job->{arvados_task}->{output}),
-                                             });;
+    'manifest_text' => system("whget", $Job->{'output'}),
+  });
 }
 
 
@@ -918,9 +918,6 @@ sub preprocess_stderr
 
   while ($jobstep[$job]->{stderr} =~ /^(.*?)\n/) {
     my $line = $1;
-    if ($line =~ /\+\+\+mr/) {
-      last;
-    }
     substr $jobstep[$job]->{stderr}, 0, 1+length($line), "";
     Log ($job, "stderr $line");
     if ($line =~ /srun: error: (SLURM job $ENV{SLURM_JOBID} has expired) /) {