Add Ubuntu Wily Werewolf

[git-tools-moved-to-github.git] / update-archive / update-yum-archive.sh

diff --git a/update-archive/update-yum-archive.sh b/update-archive/update-yum-archive.sh
index f280e64..34ab5dc 100755 (executable)
--- 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