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.
This commit is contained in:
parent
3a05380151
commit
ca20339ce2
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user