[ARVADOS] updated: 1865158987c87ef6e6b1c53db65615b17b6324af

[git at public.curoverse.com]

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

       via  1865158987c87ef6e6b1c53db65615b17b6324af (commit)
      from  862a1fd23f072b7107595755996fc2ec1c62162b (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 1865158987c87ef6e6b1c53db65615b17b6324af
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Aug 7 09:54:07 2014 -0400

    3482: crunch-job logs locator of job output sans permission hints.
    
    This makes crunch-job log a locator that's consistent with the output
    locator that it sets for the job in the database.  Closes #3482.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 5345b37..1654646 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -834,8 +834,10 @@ if ($job_has_uuid) {
                           'finished_at' => scalar gmtime)
 }
 
-if ($collated_output)
-{
+if (!$collated_output) {
+  Log(undef, "output undef");
+}
+else {
   eval {
     open(my $orig_manifest, '-|', 'arv-get', $collated_output)
         or die "failed to get collated manifest: $!";
@@ -858,7 +860,8 @@ if ($collated_output)
       'uuid' => md5_hex($stripped_manifest_text),
       'manifest_text' => $orig_manifest_text,
     });
-    $Job->update_attributes('output' => $output->{uuid});
+    Log(undef, "output " . $output->{uuid});
+    $Job->update_attributes('output' => $output->{uuid}) if $job_has_uuid;
     if ($Job->{'output_is_persistent'}) {
       $arv->{'links'}->{'create'}->execute('link' => {
         'tail_kind' => 'arvados#user',
@@ -1244,15 +1247,6 @@ sub collate_output
   }
   waitpid($pid, 0);
 
-  if ($joboutput)
-  {
-    Log (undef, "output $joboutput");
-    $Job->update_attributes('output' => $joboutput) if $job_has_uuid;
-  }
-  else
-  {
-    Log (undef, "output undef");
-  }
   return $joboutput;
 }
 

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


hooks/post-receive
--