From 295ce62d49bbbe7450c23c74a1d26ba30598631a Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Mar 12 2015 20:45:23 +0000 Subject: expanded p_abrt to run on C7, added Matej to authors file --- diff --git a/AUTHORS b/AUTHORS index bd87de8..0fa1c83 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,3 +13,4 @@ Sahil Aggarwal Saager Mhatre Iain Douglas Anssi Johansson +Matej Habrnal diff --git a/tests/p_abrt/abrt_gpg_keys_test.sh b/tests/p_abrt/abrt_gpg_keys_test.sh index e3e26bb..9c67b80 100755 --- a/tests/p_abrt/abrt_gpg_keys_test.sh +++ b/tests/p_abrt/abrt_gpg_keys_test.sh @@ -1,12 +1,15 @@ #!/bin/sh # Author: Athmane Madjoudj +# Christoph Galuschka # Note: This was a known issue in CentOS 6.0 # See: http://bugs.centos.org/view.php?id=4993 +# Christoph Galuschka: added functionality for C7 t_Log "Running $0 - check that abrt is using CentOS' gpg keys." -if (t_GetPkgRel basesystem | grep -q el6) -then +if [ "$centos_ver" = "7" ] ;then + ls /etc/pki/rpm-gpg/ | grep -q "RPM-GPG-KEY-CentOS" +elif [ "$centos_ver" = "6" ] ; then grep -q "RPM-GPG-KEY-CentOS" /etc/abrt/gpg_keys else echo "Skipped on CentOS 5"