X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=update-archive%2Fupdate-yum-archive.sh;h=6297ce51f8a126bbed28db52965a66c2b8f48307;hb=46340c8a878d4a45eb3296c9a47f8d43110d7d78;hp=482fc09eb1fcef51599eb80ed9d9143c0be4a36b;hpb=415a7b3518c55816ce7e8be5da5c7593d8333abb;p=git-tools-moved-to-github.git

diff --git a/update-archive/update-yum-archive.sh b/update-archive/update-yum-archive.sh
index 482fc09..6297ce5 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; do
+for vdist in centos/5.5 rhel/5.5 centos/6; do
   dist=`basename $vdist`
   vendor=`dirname $vdist`
   ftpdir=/home/ftp/pub/yum/$vendor/$dist
@@ -86,11 +86,19 @@ for vdist in centos/5.5 rhel/5.5; do
           for arch in $architectures; do
             mkdir -p $d/${arch}/Packages
             for f in $distdir/RPMS/${arch}/*.rpm $distdir/RPMS/noarch/*.rpm; do
+              b=`basename $f`
               if test -f $f; then
+                mustsign=false
 		age=`stat --printf='%Y' $f`
 		if expr $now - $age \< $signage >/dev/null; then
+                  mustsign=true
+                fi
+                if test ! -f $d/${arch}/Packages/$b; then
+		  mustsign=true
+                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
@@ -115,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