arvados-cli 0.1.20150605170031 → 0.1.20150612180532

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 285db94e1d07f81d34fc16dd2afdb4861d7682af
-  data.tar.gz: 1439d215e2d56c75c36f9103ce802b292857684d
+  metadata.gz: e7b56a00e393a7f5d9fa259e633b661b2b720a8a
+  data.tar.gz: b5ddabf741422dc9da49e4253e0d5e3d050d133d
 SHA512:
-  metadata.gz: eabe822a504b02a89cd160c34980464b1ad6d861f0c402e32be7aae47722d6b378012b8cbeb74156d8bd9a6f4b303d026077de19c82d2ae32dfd8d028c9a3eb4
-  data.tar.gz: e4bdb2371ce1d2ab577db7d17510e66f714d876b87f9c7d27c667b1926404d89ab7761a949d3be11231eb03052441847b813955fb66509dfec577c4148d5e172
+  metadata.gz: 002519e2ea167ae32f7c5ab91c0bdc8bf17e5744c4131526d5ad9990c2749267afcbaff30a23dc0b0b74e9686fe78736054424613a9f464717cb86b40caf8f6b
+  data.tar.gz: ceae829320fcef6bd92f1ea4a7a2d4945897c7284d19cd358ff583d512b086e20285a43406abb34b569a6b8e106eb5d7568acfe3b0abfecc0b83f3e3a6fb1c4e

data/bin/crunch-job

@@ -2146,13 +2146,27 @@ if (-d $sdk_root) {
 }
 
 my $python_dir = "$install_dir/python";
-if ((-d $python_dir) and can_run("python2.7") and
-    (system("python2.7", "$python_dir/setup.py", "--quiet", "egg_info") != 0)) {
-  # egg_info failed, probably when it asked git for a build tag.
-  # Specify no build tag.
-  open(my $pysdk_cfg, ">>", "$python_dir/setup.cfg");
-  print $pysdk_cfg "\n[egg_info]\ntag_build =\n";
-  close($pysdk_cfg);
+if ((-d $python_dir) and can_run("python2.7")) {
+  open(my $egg_info_pipe, "-|",
+       "python2.7 \Q$python_dir/setup.py\E --quiet egg_info 2>&1 >/dev/null");
+  my @egg_info_errors = <$egg_info_pipe>;
+  close($egg_info_pipe);
+  if ($?) {
+    if (@egg_info_errors and ($egg_info_errors[-1] =~ /\bgit\b/)) {
+      # egg_info apparently failed because it couldn't ask git for a build tag.
+      # Specify no build tag.
+      open(my $pysdk_cfg, ">>", "$python_dir/setup.cfg");
+      print $pysdk_cfg "\n[egg_info]\ntag_build =\n";
+      close($pysdk_cfg);
+    } else {
+      my $egg_info_exit = $? >> 8;
+      foreach my $errline (@egg_info_errors) {
+        print STDERR_ORIG $errline;
+      }
+      warn "python setup.py egg_info failed: exit $egg_info_exit";
+      exit ($egg_info_exit || 1);
+    }
+  }
 }
 
 # Hide messages from the install script (unless it fails: shell_or_die

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20150605170031
+  version: 0.1.20150612180532
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -178,7 +178,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados command line tools, git commit b33597e94eec5f21fbbcfa72611a3b36397755d5
+description: Arvados command line tools, git commit f0a92e384da79e0a17efb42de17031f45f006e44
 email: gem-dev@curoverse.com
 executables:
 - arv