From 6340ada6232e4ee004dc8c39d8ec3ad11a23250e Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Fri, 11 Feb 2011 20:11:55 +0000 Subject: - Stop if signature doesn't work after 15 try - remove signature before trying to add it again --- modules/buildsystem/templates/sign-check-package | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/buildsystem/templates/sign-check-package b/modules/buildsystem/templates/sign-check-package index 6d16aa87..ebb81f61 100644 --- a/modules/buildsystem/templates/sign-check-package +++ b/modules/buildsystem/templates/sign-check-package @@ -8,9 +8,16 @@ tmpfile=`mktemp` cp -pf "$file" "$tmpfile" rpm --delsign "$tmpfile" /usr/bin/mga-signpackage "$tmpfile" "$key" "$keydir" +nbtry=0 while rpmsign -Kv "$tmpfile" 2>&1 | grep BAD do + nbtry=$(($nbtry + 1)) + if [ $nbtry -ge 15 ] + then + exit 1 + fi cp -pf "$file" "$tmpfile" + rpm --delsign "$tmpfile" /usr/bin/mga-signpackage "$tmpfile" "$key" "$keydir" done mv -f "$tmpfile" "$file" -- cgit v1.2.1