indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Get pgp public key when default keyid is unavailable

merge-requests/30/head
Bob Mottram 2021-05-05 11:13:26 +01:00
parent 61d650c6f7
commit 60aad9cfd2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pgp.py
View File

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