projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f15b218
)
4312: Call virtualenv pip directly instead of using activate.
author
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 7 Jan 2015 19:51:16 +0000
(14:51 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 7 Jan 2015 19:51:16 +0000
(14:51 -0500)
sdk/cli/bin/crunch-job
patch
|
blob
|
history
diff --git
a/sdk/cli/bin/crunch-job
b/sdk/cli/bin/crunch-job
index 21ee2d735fca47f400ff7c7a41e930e5fa10cdca..4cd41828834b3c729f9fe53fca4a68a88b044b0b 100755
(executable)
--- a/
sdk/cli/bin/crunch-job
+++ b/
sdk/cli/bin/crunch-job
@@
-1854,7
+1854,7
@@
if (@ARGV) {
my $pkgs;
if ($venv_built) {
$Log->("Running in Python SDK virtualenv");
- $pkgs = `
. \Q$venv_dir/bin/activate\E && ((pip
freeze 2>/dev/null | grep arvados) || dpkg --show '*arvados*')`;
+ $pkgs = `
((\Q$venv_dir/bin/pip\E
freeze 2>/dev/null | grep arvados) || dpkg --show '*arvados*')`;
my $orig_argv = join(" ", map { quotemeta($_); } @ARGV);
@ARGV = ("/bin/sh", "-ec",
". \Q$venv_dir/bin/activate\E; exec $orig_argv");