From 60aad9cfd245142015fa7549b81b2656a6be590d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 5 May 2021 11:13:26 +0100
Subject: [PATCH] Get pgp public key when default keyid is unavailable

---
 pgp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pgp.py b/pgp.py
index 37444c126..81720f3a3 100644
--- a/pgp.py
+++ b/pgp.py
@@ -362,7 +362,7 @@ def hasLocalPGPkey() -> bool:
     homeDir = str(Path.home())
     gpgDir = homeDir + '/.gnupg'
     if os.path.isdir(gpgDir):
-        keyId = _pgpLocalPublicKeyId()
+        keyId = pgpLocalPublicKey()
         if keyId:
             return True
     return False
@@ -428,7 +428,7 @@ def pgpLocalPublicKey() -> str:
     """
     keyId = _pgpLocalPublicKeyId()
     if not keyId:
-        return None
+        keyId = ''
     cmdStr = "gpg --armor --export " + keyId
     proc = subprocess.Popen([cmdStr],
                             stdout=subprocess.PIPE, shell=True)