QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpm_verify: do not panic when the file doesn't exist

Browse Source 
It turns out revisor attempts to verify some non-existent files, and this should
not cause an abort.
This commit is contained in:
Joanna Rutkowska 2011-11-10 18:33:04 +01:00
parent 3a30465f0d
commit 88db331d6b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpm_verify
View File

@ -3,7 +3,12 @@
verify_rpm() { verify_rpm() {
RPM=$1 RPM=$1
if ! rpm --checksig $1 > /dev/null; then if ! [ -f $RPM ]; then
echo -n "No such file... "
return
fi
if ! rpm --checksig $RPM > /dev/null; then
echo "Wrong PGP signature!" echo "Wrong PGP signature!"
exit 1 exit 1
fi fi
@ -12,7 +17,7 @@ fi
# mean that the rpm has been signed! It might simply # mean that the rpm has been signed! It might simply
# have no PGP signature at all. Yes, stupidity... # have no PGP signature at all. Yes, stupidity...
if ! rpm --checksig $1 | grep pgp > /dev/null ; then if ! rpm --checksig $RPM | grep pgp > /dev/null ; then
echo "No PGP signature found!" echo "No PGP signature found!"
if [ "$NO_SIGN" == "1" ] ; then if [ "$NO_SIGN" == "1" ] ; then
@ -27,7 +32,6 @@ fi
} }
echo "NO_SIGN = $NO_SIGN"
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
echo "Usage: $0 <rpm file>" echo "Usage: $0 <rpm file>"
exit 1 exit 1