From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 31 May 2017 22:56:20 +0000 (+0200)
Subject: build/ops: make sure which is installed in run-make-check.sh
X-Git-Tag: v12.1.0~152^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec01d242cbc3324c1950b97a3e8ed9c5bed50644;p=ceph.git

build/ops: make sure which is installed in run-make-check.sh

Fixes: http://tracker.ceph.com/issues/20127
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/run-make-check.sh b/run-make-check.sh
index c5139e98bba..4ec97be2fcd 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -29,6 +29,7 @@ function get_processors() {
 
 function run() {
     local install_cmd
+    local which_pkg="which"
     if test -f /etc/redhat-release ; then
         source /etc/os-release
         if ! type bc > /dev/null 2>&1 ; then
@@ -40,6 +41,8 @@ function run() {
         else
             install_cmd="yum install -y"
         fi
+    else
+        which_pkg="debianutils"
     fi
 
     type apt-get > /dev/null 2>&1 && install_cmd="apt-get install -y"
@@ -51,7 +54,7 @@ function run() {
         exit 1
     fi
     if [ -n "$install_cmd" ]; then
-        $DRY_RUN sudo $install_cmd ccache jq
+        $DRY_RUN sudo $install_cmd ccache jq $which_pkg
     else
         echo "WARNING: Don't know how to install packages" >&2
     fi