From: Brad Hubbard <bhubbard@redhat.com>
Date: Wed, 14 Sep 2016 07:13:47 +0000 (+1000)
Subject: run-*make-check.sh: Make DRY_RUN actually mean a dry run
X-Git-Tag: v11.0.1~240^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11074%2Fhead;p=ceph.git

run-*make-check.sh: Make DRY_RUN actually mean a dry run

DRY_RUN does not currently do an actual dry run as it actually runs an install
command.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/run-cmake-check.sh b/run-cmake-check.sh
index 8f95eacd68c..1446434abb0 100755
--- a/run-cmake-check.sh
+++ b/run-cmake-check.sh
@@ -38,7 +38,7 @@ function run() {
     type apt-get > /dev/null 2>&1 && install_cmd="apt-get install -y"
     type zypper > /dev/null 2>&1 && install_cmd="zypper --gpg-auto-import-keys --non-interactive install"
     if [ -n "$install_cmd" ]; then
-        sudo $install_cmd ccache jq
+        $DRY_RUN sudo $install_cmd ccache jq
     else
         echo "WARNING: Don't know how to install packages" >&2
     fi
diff --git a/run-make-check.sh b/run-make-check.sh
index 05230adfd5e..ce860c3e5ee 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -56,7 +56,7 @@ function run() {
     type apt-get > /dev/null 2>&1 && install_cmd="apt-get install -y"
     type zypper > /dev/null 2>&1 && install_cmd="zypper --gpg-auto-import-keys --non-interactive install"
     if [ -n "$install_cmd" ]; then
-        sudo $install_cmd ccache jq
+        $DRY_RUN sudo $install_cmd ccache jq
     else
         echo "WARNING: Don't know how to install packages" >&2
     fi