projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1ea3251
)
4312: Fix dpkg search to use dpkg-query.
author
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 7 Jan 2015 21:32:23 +0000
(16:32 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 7 Jan 2015 21:32:23 +0000
(16:32 -0500)
sdk/cli/bin/crunch-job
patch
|
blob
|
history
diff --git
a/sdk/cli/bin/crunch-job
b/sdk/cli/bin/crunch-job
index 4cd41828834b3c729f9fe53fca4a68a88b044b0b..bf2612d9e0b34f7ec505473b319aca5bd81aee23 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");
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");
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 {
$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) {
}
if ($pkgs) {