X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=update-archive%2Fupdate-yum-archive.sh;h=34ab5dcbd517a96dea8cef79783e836d0ed27c44;hb=4d1d642b47e16e1a45b712b8bf6484f853fbdd50;hp=f280e645fdf6c224d2c7cdcedf5b3c8e0ff12bc4;hpb=ee3f28f267466f65640bb95cb5cea9e1fa903fee;p=git-tools-moved-to-github.git

diff --git a/update-archive/update-yum-archive.sh b/update-archive/update-yum-archive.sh
index f280e64..34ab5dc 100755
--- a/update-archive/update-yum-archive.sh
+++ b/update-archive/update-yum-archive.sh
@@ -31,7 +31,7 @@ signage=8000
 confdir=`pwd`
 architectures="i386 x86_64"
 dirs_to_upd=""
-for vdist in centos/5.5 rhel/5.5 centos/6; do
+for vdist in centos/5.5 rhel/5.5 centos/6 centos/7; do
   dist=`basename $vdist`
   vendor=`dirname $vdist`
   ftpdir=/home/ftp/pub/yum/$vendor/$dist
@@ -98,7 +98,7 @@ for vdist in centos/5.5 rhel/5.5 centos/6; do
                 fi
                 if $mustsign; then
                   ln -sf $f $d/${arch}/Packages/
-		  if rpm -K $f|grep -q ' gpg' >/dev/null; then
+		  if rpm -K $f|grep -q 'GPG' >/dev/null; then
 		    echo "Already signed $f"
                   else
   		    expect << __EOF
@@ -123,7 +123,10 @@ echo "Updating repository meta:"
 for rdir in ${dirs_to_upd}; do
   echo "Section ${rdir}"
   if test -d $rdir && ls -A $rdir; then
-  	createrepo --update ${rdir}
+	# Get rid of createrepo warnings
+	# https://bugs.launchpad.net/ubuntu/+source/createrepo/+bug/530015
+  	createrepo -q --update ${rdir} 2>&1 |
+		grep -v DeprecationWarning:|grep -v '  import'
   	if test -f ${rdir}/repodata/repomd.xml.asc; then
     		rm ${rdir}/repodata/repomd.xml.asc
   	fi