don't crash with bad gpg key imports
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 27 Jul 2015 21:55:16 +0000 (17:55 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 7 Dec 2015 18:28:41 +0000 (13:28 -0500)
edward

diff --git a/edward b/edward
index 1dad2e1c8062dc2aab55e7c658f9304598c2e838..73def29284b3c0d1bf422aa7e9b7f8da86617ea6 100755 (executable)
--- a/edward
+++ b/edward
@@ -939,8 +939,11 @@ def add_gpg_key (key_block, gpgme_ctx):
 
     fp = io.BytesIO(key_block.encode('ascii'))
 
-    result = gpgme_ctx.import_(fp)
-    imports = result.imports
+    try:
+        result = gpgme_ctx.import_(fp)
+        imports = result.imports
+    except gpgme.GpgmeError:
+        imports = []
 
     key_fingerprints = []