[ARVADOS] updated: 48cec3aa7a95edb0bd185a7923797299294017ff

git at public.curoverse.com git at public.curoverse.com
Mon Dec 1 16:17:13 EST 2014


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

       via  48cec3aa7a95edb0bd185a7923797299294017ff (commit)
      from  b0bbd5ec9f29e1a7e297b4de4d19b238cf188f3b (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 48cec3aa7a95edb0bd185a7923797299294017ff
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Dec 1 16:11:32 2014 -0500

    4027: Fixup Crunch to provide a PySDK build tag.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index caf837b..d65c9ba 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1890,6 +1890,16 @@ if (-d $sdk_root) {
   }
 }
 
+my $python_dir = "$install_dir/python";
+if ((-d $python_dir) and can_run("python2.7") and
+    (system("python2.7 \Q$python_dir/setup.py\E egg_info 2>/dev/null") != 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 (-e "$destdir/crunch_scripts/install") {
     shell_or_die ("$destdir/crunch_scripts/install", $install_dir);
 } elsif (!-e "./install.sh" && -e "./tests/autotests.sh") {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list