[ARVADOS] updated: 38891aedbd12a4a04a7009edc1203fadf564af46
git at public.curoverse.com
git at public.curoverse.com
Wed Jan 7 16:31:31 EST 2015
Summary of changes:
sdk/cli/bin/crunch-job | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
via 38891aedbd12a4a04a7009edc1203fadf564af46 (commit)
from 1ea3251891770887654a3d9ae68f5f1cf7f1d689 (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 38891aedbd12a4a04a7009edc1203fadf564af46
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Jan 7 16:32:23 2015 -0500
4312: Fix dpkg search to use dpkg-query.
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 4cd4182..bf2612d 100755
--- 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/pip\E freeze 2>/dev/null | grep arvados) || dpkg --show '*arvados*')`;
+ $pkgs = `((\Q$venv_dir/bin/pip\E freeze 2>/dev/null | grep arvados) || dpkg-query --show '*arvados*')`;
my $orig_argv = join(" ", map { quotemeta($_); } @ARGV);
@ARGV = ("/bin/sh", "-ec",
". \Q$venv_dir/bin/activate\E; exec $orig_argv");
@@ -1862,7 +1862,7 @@ if (@ARGV) {
$Log->("Warning: virtualenv not found inside Docker container default " +
"\$PATH. Can't install Python SDK.");
} else {
- $pkgs = `((pip freeze 2>/dev/null | grep arvados) || dpkg --show '*arvados*')`;
+ $pkgs = `((pip freeze 2>/dev/null | grep arvados) || dpkg-query --show '*arvados*')`;
}
if ($pkgs) {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list