[ARVADOS] updated: 253e2855e4ae2957c8087e6c5cec2a30fa2f7087

git at public.curoverse.com git at public.curoverse.com
Thu Feb 26 10:49:37 EST 2015


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

       via  253e2855e4ae2957c8087e6c5cec2a30fa2f7087 (commit)
       via  687beedad66437de691977586b97ab641581401e (commit)
      from  a12247ffaf73cfbc4973b2e22ea4c650b66438f8 (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 253e2855e4ae2957c8087e6c5cec2a30fa2f7087
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Feb 26 10:49:33 2015 -0500

    5283: Fixup log message by request.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 4ba84fa..54b834b 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1329,7 +1329,7 @@ print (arvados.api("v1").collections().
     }
   }
   close($child_in);
-  Log(undef, "collated output manifest is $manifest_size bytes, including any access tokens");
+  Log(undef, "collated output manifest text to send to API server is $manifest_size bytes with access tokens");
 
   my $joboutput;
   my $s = IO::Select->new($child_out);

commit 687beedad66437de691977586b97ab641581401e
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Feb 26 10:49:27 2015 -0500

    5283: Fixup null output detection.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 43e0480..4ba84fa 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1304,8 +1304,8 @@ print (arvados.api("v1").collections().
   for (@jobstep)
   {
     ++$task_idx;
-    next unless exists $_->{'arvados_task'}->{'output'};
     my $output = $_->{'arvados_task'}->{output};
+    next if (!defined($output));
     my ($next_write, $errmsg);
     if ($output =~ /^[0-9a-f]{32}(\+\S+)*$/) {
       $next_write = fetch_block($output);

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list