From 396ff12342dcf96352b24be7909e84b5cbfd8323 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 12 Dec 2017 19:40:01 +0000 Subject: [PATCH] pakfire: Properly check if we have our key with our fingerprint Signed-off-by: Michael Tremer --- src/pakfire/lib/functions.pl | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index f7f9d346c8..0bf702e5b0 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -901,16 +901,15 @@ sub senduuid { sub checkcryptodb { logger("CRYPTO INFO: Checking GnuPG Database"); - my $ret = system("gpg --list-keys | grep -q $myid"); - unless ( "$ret" eq "0" ) { - message("CRYPTO WARN: The GnuPG isn't configured correctly. Trying now to fix this."); - message("CRYPTO WARN: It's normal to see this on first execution."); - message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP."); - my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2"; - system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1"); - } else { - logger("CRYPTO INFO: Database is okay"); - } + system("gpg --fingerprint $myid >/dev/null"); + return if ($? == 0); + + message("CRYPTO WARN: The GnuPG isn't configured correctly. Trying now to fix this."); + message("CRYPTO WARN: It's normal to see this on first execution."); + message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP."); + + my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2"; + system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1"); } sub callback { -- 2.39.5