Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager

[arvados.git] / sdk / cli / bin / crunch-job

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 21ee2d735fca47f400ff7c7a41e930e5fa10cdca..3539a57a039246c35b1e92b1f8f11b51a3c0f28c 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-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) {