From e379fed1437a0e94f51b26ab8ccd74fc0dacc4b9 Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Nov 09 2012 09:46:04 +0000 Subject: update yum distrover test so it works on C5 and C6 --- diff --git a/tests/p_yum/yum_distroverpkg.sh b/tests/p_yum/yum_distroverpkg.sh index 57d84b5..3ea970a 100755 --- a/tests/p_yum/yum_distroverpkg.sh +++ b/tests/p_yum/yum_distroverpkg.sh @@ -1,13 +1,7 @@ #!/bin/sh -# Author: Athmane Madjoudj t_Log "Running $0 - Yum configuration has the correct distroverpkg value test." -if (t_GetPkgRel basesystem | grep -q el6) -then - grep "distroverpkg=centos-release" /etc/yum.conf >/dev/null 2>&1 -else - echo "Test skipped for CentOS <= 5" -fi - -t_CheckExitStatus $? +ProvierTag=$(grep distroverpkg /etc/yum.conf | cut -f2 -d'=') +rpm -q --whatprovides ${ProvierTag} | grep centos-release > /dev/null +t_CheckExitStatus $? \ No newline at end of file