From 4638bb73c7bcd14dbda77bfb4610edcdeaa07d57 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht <sudoman@ninthfloor.org> Date: Thu, 23 Jul 2015 11:32:54 -0400 Subject: [PATCH] check to see if we have keys before adding them --- edward | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edward b/edward index 0c12f1e..091716c 100755 --- a/edward +++ b/edward @@ -349,7 +349,7 @@ def prepare_for_reply_pieces (eddymsg_obj, replyinfo_obj): prepare_for_reply(piece.gpg_data.plainobj, replyinfo_obj) elif piece.piece_type == "pubkey": - if piece.gpg_data == None: + if piece.gpg_data == None or piece.gpg_data.keys == []: replyinfo_obj.no_public_key = True else: replyinfo_obj.public_key_received = True @@ -359,7 +359,7 @@ def prepare_for_reply_pieces (eddymsg_obj, replyinfo_obj): elif (piece.piece_type == "clearsign") \ or (piece.piece_type == "detachedsig"): - if piece.gpg_data == None: + if piece.gpg_data == None or piece.gpg_data.sigs == []: replyinfo_obj.sig_failure = True else: replyinfo_obj.sig_success = True -- 2.25.1