From ca20339ce2d01b3b9dec81364a8511b6f81c9dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 8 Apr 2014 02:30:07 +0200
Subject: [PATCH] Fix rpm_verify script

Do not match unsigned package with 'pgp' in name as signed.
Also do not show "No PGP signature found!" warning when signing is
disabled in builder.conf.
---
 rpm_verify | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpm_verify b/rpm_verify
index 942ca89..0d98f66 100755
--- a/rpm_verify
+++ b/rpm_verify
@@ -17,9 +17,7 @@ fi
 # mean that the rpm has been signed! It might simply
 # have no PGP signature at all. Yes, stupidity...
 
-if ! rpm --checksig $RPM | grep pgp > /dev/null ; then
-    echo "No PGP signature found!"
-
+if ! rpm --checksig $RPM | grep ' pgp ' > /dev/null ; then
     if [ "$NO_SIGN" == "1" ] ; then
         # When signing is disabed in qubes-builder
         # This is used to build unsigned ISO
@@ -27,6 +25,8 @@ if ! rpm --checksig $RPM | grep pgp > /dev/null ; then
         return 0
     fi
 
+    echo "No PGP signature found!"
+
     exit 2
 fi
 }