[ARVADOS] updated: 52b3716d78c410806e8aaea89994b39015694258

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

       via  52b3716d78c410806e8aaea89994b39015694258 (commit)
      from  c2aeaa729c350a33ec47ae1b012e50a6685ac2d2 (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 52b3716d78c410806e8aaea89994b39015694258
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Apr 15 17:10:02 2014 -0400

    Parameterize the 'arv' command so that it can be specified with an environment
    variable to make it easier to run with the right environment for development.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 25c1ee0..48a6c9d 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -95,6 +95,15 @@ $ENV{"CRUNCH_INSTALL"} = "$ENV{CRUNCH_TMP}/opt";
 $ENV{"CRUNCH_WORK"} = $ENV{"JOB_WORK"}; # deprecated
 mkdir ($ENV{"JOB_WORK"});
 
+my $arv_cli;
+
+if (defined $ENV{"ARV_CLI"}) {
+  $arv_cli = $ENV{"ARV_CLI"};
+}
+else {
+  $arv_cli = 'arv';
+}
+
 my $force_unlock;
 my $git_dir;
 my $jobspec;
@@ -1074,7 +1083,7 @@ sub fetch_block
   my $hash = shift;
   my ($keep, $child_out, $output_block);
 
-  my $cmd = "arv keep get \Q$hash\E";
+  my $cmd = "$arv_cli keep get \Q$hash\E";
   open($keep, '-|', $cmd) or die "fetch_block: $cmd: $!";
   sysread($keep, $output_block, 64 * 1024 * 1024);
   close $keep;
@@ -1086,7 +1095,7 @@ sub collate_output
   Log (undef, "collate");
 
   my ($child_out, $child_in);
-  my $pid = open2($child_out, $child_in, 'arv', 'keep', 'put', '--raw');
+  my $pid = open2($child_out, $child_in, $arv_cli, 'keep', 'put', '--raw');
   my $joboutput;
   for (@jobstep)
   {
@@ -1236,7 +1245,7 @@ sub save_meta
   return if $justcheckpoint;  # checkpointing is not relevant post-Warehouse.pm
 
   $local_logfile->flush;
-  my $cmd = "arv keep put --filename ''\Q$keep_logfile\E "
+  my $cmd = "$arv_cli keep put --filename ''\Q$keep_logfile\E "
       . quotemeta($local_logfile->filename);
   my $loglocator = `$cmd`;
   die "system $cmd failed: $?" if $?;

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


hooks/post-receive
--