From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 17 May 2015 19:29:25 +0000 (+0200)
Subject: ceph-detect-init: run-tox.sh always succeeds
X-Git-Tag: v9.0.2~145^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=855aeee6971c1eab637a1d258a1df49710ed3946;p=ceph.git

ceph-detect-init: run-tox.sh always succeeds

Because of the | grep, the status of tox is no longer the status of
run-tox.sh and errors are not reported as they should.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/ceph-detect-init/run-tox.sh b/src/ceph-detect-init/run-tox.sh
index 2f0e62b7757f..206938e28767 100755
--- a/src/ceph-detect-init/run-tox.sh
+++ b/src/ceph-detect-init/run-tox.sh
@@ -30,4 +30,7 @@ if test -d wheelhouse ; then
 fi
 pip --log make-check/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse --upgrade distribute
 pip --log make-check/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9' 
-tox 2>&1 | grep -v InterpreterNotFound
+tox > make-check/tox.out 2>&1 
+status=$?
+grep -v InterpreterNotFound < make-check/tox.out
+exit $status