From dc24daf1d7efdc7a4ec0f947e5424863b00af47a Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Wed, 22 Jul 2015 19:42:28 -0400 Subject: [PATCH] this belongs over here partly because the function it was in was recursive. --- edward | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/edward b/edward index 510ab0f..ca8d4f7 100755 --- a/edward +++ b/edward @@ -327,13 +327,6 @@ def prepare_for_reply (eddymsg_obj, replyinfo_obj): do_to_eddys_pieces(prepare_for_reply_pieces, eddymsg_obj, replyinfo_obj) - if replyinfo_obj.target_key == None: - replyinfo_obj.target_key = replyinfo_obj.fallback_target_key - - if replyinfo_obj.target_key == None: - replyinfo_obj.no_public_key = True - - def prepare_for_reply_pieces (eddymsg_obj, replyinfo_obj): for piece in eddymsg_obj.payload_pieces: @@ -404,6 +397,9 @@ def flatten_payloads (eddymsg_obj): def get_key_from_fp (replyinfo_obj, gpgme_ctx): + if replyinfo_obj.target_key == None: + replyinfo_obj.target_key = replyinfo_obj.fallback_target_key + if replyinfo_obj.target_key != None: try: encrypt_to_key = gpgme_ctx.get_key(replyinfo_obj.target_key) -- 2.25.1