From bd094db1b408296ddc89bcf7de7383e0f0445195 Mon Sep 17 00:00:00 2001 From: Bruce Potter Date: Fri, 11 Oct 2013 17:42:39 -0400 Subject: [PATCH] filter out signing msg in build script --- buildcore.sh | 4 ++-- builddep.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildcore.sh b/buildcore.sh index 32d97b12e..c72d36000 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -348,8 +348,8 @@ if [ "$OSNAME" != "AIX" ]; then echo '%_gpg_name Jarrod Johnson' >> $MACROS fi echo "Signing RPMs..." - build-utils/rpmsign.exp `find $DESTDIR -type f -name '*.rpm'` | grep -v -E '(was already signed|rpm --quiet --resign|WARNING: standard input reopened)' - build-utils/rpmsign.exp $SRCDIR/*rpm | grep -v -E '(was already signed|rpm --quiet --resign|WARNING: standard input reopened)' + build-utils/rpmsign.exp `find $DESTDIR -type f -name '*.rpm'` | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)' + build-utils/rpmsign.exp $SRCDIR/*rpm | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)' createrepo --checksum sha $DESTDIR # specifying checksum so the repo will work on rhel5 createrepo --checksum sha $SRCDIR rm -f $SRCDIR/repodata/repomd.xml.asc diff --git a/builddep.sh b/builddep.sh index 2f6e1dbaf..ebe95e2e6 100755 --- a/builddep.sh +++ b/builddep.sh @@ -97,7 +97,7 @@ if [ "$OSNAME" != "AIX" ]; then # Sign the rpms that are not already signed. The "standard input reopened" warnings are normal. echo "Signing RPMs..." - $XCATCOREDIR/build-utils/rpmsign.exp `find . -type f -name '*.rpm'` | grep -v -E '(was already signed|rpm --quiet --resign|WARNING: standard input reopened)' + $XCATCOREDIR/build-utils/rpmsign.exp `find . -type f -name '*.rpm'` | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)' # Create the repodata dirs echo "Creating repodata directories..."