arvados-cli 0.1.20140909115812 → 0.1.20140909151622

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2752a1935c195116d03b53fc19feee153f5cc5d8
-  data.tar.gz: 74e1c709e797b59f88ffa0615fb966c674f399c3
+  metadata.gz: c9615585720664982aa7d76d12874384c6905198
+  data.tar.gz: 72d2dacdb50723c8b9dd01eeb907eb03533247b0
 SHA512:
-  metadata.gz: b8bfa9fa47902cadc08cfee78a9ba89a67352537bf8d61e4095ec54fde326ff7f3e67f9db9fdfec9443172f0e4fa85fc4aa9a22f3398ca7f690f34c22281956f
-  data.tar.gz: 62bf369b7fa6b4fc156fe90a80f4d966d54c75386a72cadf95ebafbb1e0424c3315df6c7927b7eefe6e134f6f525770cb229670bdb2786affcd2b773b7ce6023
+  metadata.gz: 21180f0df8bdeabb95ca2a17e9c17c45c15fdf3c55f5ac34074d98e4c9ec63371a3f9586540a2c4a88b10c7acb8b55269d2b188ea19a3fd2b339e6773e8b5036
+  data.tar.gz: b8b1d3578a084db315aabc4a5a4dbf10eb8561f5bf9dbefe3f3f79b6630c9a95eef39bca353b1c03343f874a879d82eb92bc2becc6f0e19615abc174b978e555

data/bin/crunch-job

@@ -447,9 +447,10 @@ else
   if ($treeish =~ m{^\d{1,4}$}) {
     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}$/) {
+    Log(undef, "git Subversion search exited $?");
+    if (($? == 0) && ($gitlog =~ /^[a-f0-9]{40}$/)) {
       $commit = $gitlog;
-      Log (undef, "Using commit $commit for script_version $treeish");
+      Log(undef, "Using commit $commit for Subversion revision $treeish");
     }
   }
 
@@ -458,21 +459,19 @@ else
   if (!defined $commit) {
     my $found = `git --git-dir=\Q$repo\E rev-list -1 ''\Q$treeish\E`;
     chomp $found;
-    if ($found =~ /^[0-9a-f]{40}$/s) {
+    Log(undef, "git rev-list exited $? with result '$found'");
+    if (($? == 0) && ($found =~ /^[0-9a-f]{40}$/s)) {
       $commit = $found;
+      Log(undef, "Using commit $commit for tree-ish $treeish");
       if ($commit ne $treeish) {
 	# Make sure we record the real commit id in the database,
 	# frozentokey, logs, etc. -- instead of an abbreviation or a
 	# branch name which can become ambiguous or point to a
 	# different commit in the future.
-	$ENV{"CRUNCH_SRC_COMMIT"} = $commit;
-	Log (undef, "Using commit $commit for tree-ish $treeish");
-        if ($commit ne $treeish) {
-          $Job->{'script_version'} = $commit;
-          !$job_has_uuid or
-              $Job->update_attributes('script_version' => $commit) or
-              croak("Error while updating job");
-        }
+        $Job->{'script_version'} = $commit;
+        !$job_has_uuid or
+            $Job->update_attributes('script_version' => $commit) or
+            croak("Error while updating job");
       }
     }
   }
@@ -482,6 +481,7 @@ else
     @execargs = ("sh", "-c",
 		 "mkdir -p $ENV{CRUNCH_INSTALL} && cd $ENV{CRUNCH_TMP} && perl -");
     $git_archive = `git --git-dir=\Q$repo\E archive ''\Q$commit\E`;
+    croak("git archive failed: exit " . ($? >> 8)) if ($? != 0);
   }
   else {
     croak ("could not figure out commit id for $treeish");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140909115812
+  version: 0.1.20140909151622
 platform: ruby
 authors:
 - Arvados Authors
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision f467b469109e27bc18635c8952892e4c23fabd60
+description: This is the Arvados SDK CLI gem, git revision b0440160e64caecbff160a26f62301dd15d84c7f
 email: gem-dev@curoverse.com
 executables:
 - arv