[ARVADOS] updated: 3420c2d2c55eb9466b04bc3c4ca3073caf66aba0

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

       via  3420c2d2c55eb9466b04bc3c4ca3073caf66aba0 (commit)
       via  88e682e6fc472fcc4fd2d9a0ab39ee6ba6252de0 (commit)
      from  635a2b59e4a9a3ec147b7064a932e4db17bc3955 (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 3420c2d2c55eb9466b04bc3c4ca3073caf66aba0
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 10 23:47:10 2014 -0400

    Add/fix some shell quoting.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index c1c6d3e..25c1ee0 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -195,7 +195,7 @@ if (!$have_slurm)
 }
 if (exists $ENV{SLURM_NODELIST})
 {
-  push @sinfo, `sinfo -h --format='%c %N' --nodes='$ENV{SLURM_NODELIST}'`;
+  push @sinfo, `sinfo -h --format='%c %N' --nodes=\Q$ENV{SLURM_NODELIST}\E`;
 }
 foreach (@sinfo)
 {
@@ -426,7 +426,7 @@ else
   # If this looks like a subversion r#, look for it in git-svn commit messages
 
   if ($treeish =~ m{^\d{1,4}$}) {
-    my $gitlog = `git --git-dir="$repo" log --pretty="format:%H" --grep="git-svn-id:.*\@$treeish " master`;
+    my $gitlog = `git --git-dir=\Q$repo\E log --pretty="format:%H" --grep="git-svn-id:.*\@"\Q$treeish\E" " master`;
     chomp $gitlog;
     if ($gitlog =~ /^[a-f0-9]{40}$/) {
       $commit = $gitlog;
@@ -437,7 +437,7 @@ else
   # If that didn't work, try asking git to look it up as a tree-ish.
 
   if (!defined $commit) {
-    my $found = `git --git-dir="$repo" rev-list -1 "$treeish"`;
+    my $found = `git --git-dir=\Q$repo\E rev-list -1 ''\Q$treeish\E`;
     chomp $found;
     if ($found =~ /^[0-9a-f]{40}$/s) {
       $commit = $found;
@@ -462,7 +462,7 @@ else
     $ENV{"CRUNCH_SRC_COMMIT"} = $commit;
     @execargs = ("sh", "-c",
 		 "mkdir -p $ENV{CRUNCH_INSTALL} && cd $ENV{CRUNCH_TMP} && perl -");
-    $git_archive = `git --git-dir="$repo" archive "$commit"`;
+    $git_archive = `git --git-dir=\Q$repo\E archive ''\Q$commit\E`;
   }
   else {
     croak ("could not figure out commit id for $treeish");
@@ -759,7 +759,7 @@ if ($job_has_uuid) {
 if ($Job->{'output'})
 {
   eval {
-    my $manifest_text = `arv keep get \Q$Job->{'output'}\E`;
+    my $manifest_text = `arv keep get ''\Q$Job->{'output'}\E`;
     $arv->{'collections'}->{'create'}->execute('collection' => {
       'uuid' => $Job->{'output'},
       'manifest_text' => $manifest_text,
@@ -1236,7 +1236,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 keep put --filename ''\Q$keep_logfile\E "
       . quotemeta($local_logfile->filename);
   my $loglocator = `$cmd`;
   die "system $cmd failed: $?" if $?;

commit 88e682e6fc472fcc4fd2d9a0ab39ee6ba6252de0
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 10 23:46:42 2014 -0400

    Add comments to explain different ways we choose $repo.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 0fde43a..c1c6d3e 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -400,9 +400,21 @@ else
   my $commit;
   my $git_archive;
   my $treeish = $Job->{'script_version'};
+
+  # If we're running under crunch-dispatch, it will have pulled the
+  # appropriate source tree into its own repository, and given us that
+  # repo's path as $git_dir. If we're running a "local" job, and a
+  # script_version was specified, it's up to the user to provide the
+  # full path to a local repository in Job->{repository}.
+  #
+  # TODO: Accept URLs too, not just local paths. Use git-ls-remote and
+  # git-archive --remote where appropriate.
+  #
+  # TODO: Accept a locally-hosted Arvados repository by name or
+  # UUID. Use arvados.v1.repositories.list or .get to figure out the
+  # appropriate fetch-url.
   my $repo = $git_dir || $ENV{'CRUNCH_DEFAULT_GIT_DIR'} || $Job->{'repository'};
-  # Todo: let script_version specify repository instead of expecting
-  # parent process to figure it out.
+
   $ENV{"CRUNCH_SRC_URL"} = $repo;
 
   if (-d "$repo/.git") {

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


hooks/post-receive
--