[ARVADOS] updated: 97ddc11818d059e42989f302fa15db4c5e19d5b3

git at public.curoverse.com git at public.curoverse.com
Mon Nov 17 10:56:21 EST 2014


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

       via  97ddc11818d059e42989f302fa15db4c5e19d5b3 (commit)
      from  11374252ee3c26240420bb3aa0d0433fad71731f (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 97ddc11818d059e42989f302fa15db4c5e19d5b3
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Nov 17 10:55:59 2014 -0500

    3824: Check whether there is anything to install before trying to lock $destdir.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 7205382..0d35d53 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1753,6 +1753,11 @@ if ($task_work) {
   remove_tree($task_work, {keep_root => 1});
 }
 
+my @git_archive_data = <DATA>;
+if (!@git_archive_data) {
+  # Nothing to extract -> nothing to install.
+  run_argv_and_exit();
+}
 
 open L, ">", "$destdir.lock" or die "$destdir.lock: $!";
 flock L, LOCK_EX;
@@ -1767,12 +1772,6 @@ open STDOUT, ">", "$destdir.log";
 open STDERR, ">&STDOUT";
 
 mkdir $destdir;
-my @git_archive_data = <DATA>;
-if (!@git_archive_data) {
-  # Nothing to extract -> nothing to install.
-  run_argv_and_exit();
-}
-
 open TARX, "|-", "tar", "-C", $destdir, "-xf", "-";
 print TARX @git_archive_data;
 if(!close(TARX)) {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list