[omd-commits] OMD Git: omd: tests: zypper complains about 'omd-0.45=sles11-20' not found when doing a force install

git version control git at mathias-kettner.de
Thu Dec 23 12:49:15 CET 2010


Module: omd
Branch: master
Commit: 331a9118f3d6f66ecde9d12ee9a3a1f98ee5c4fc
URL:    http://omdistro.org/projects/omd/repository/revisions/331a9118f3d6f66ecde9d12ee9a3a1f98ee5c4fc

Author: Sven Nierlein <sven at nierlein.de>
Date:   Thu Dec 23 12:47:41 2010 +0100

tests: zypper complains about 'omd-0.45=sles11-20' not found when doing a force install

---

 t/test_all.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/test_all.sh b/t/test_all.sh
index 653ed5a..bec53a7 100755
--- a/t/test_all.sh
+++ b/t/test_all.sh
@@ -24,7 +24,7 @@ if [ ! -z "$OMD_PACKAGE" ]; then
 
     # Debian / Ubuntu
     if [ -x /usr/bin/apt-get  ]; then
-        apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install `dpkg-deb --info $OMD_PACKAGE | grep Depends: | sed -e 's/Depends://' -e 's/debconf.*debconf-2.0,//' | tr -d ','` && dpkg -i $OMD_PACKAGE
+        apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -q -y --no-install-recommends install `dpkg-deb --info $OMD_PACKAGE | grep Depends: | sed -e 's/Depends://' -e 's/debconf.*debconf-2.0,//' | tr -d ','` && dpkg -i $OMD_PACKAGE
 
     # Centos
     elif [ -x /usr/bin/yum  ]; then
@@ -32,7 +32,7 @@ if [ ! -z "$OMD_PACKAGE" ]; then
 
     # Suse
     elif [ -x /usr/bin/zypper  ]; then
-        /usr/bin/zypper install -n -l --no-recommends $OMD_PACKAGE
+        /usr/bin/zypper --quiet --non-interactive install $OMD_PACKAGE || /bin/rpm -i $OMD_PACKAGE
     fi
 
     rc=$?



More information about the omd-commits mailing list