Merge tag 'debian/0.15-1' into buster-bpo

mailscripts release 0.15-1 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]

# gpg: Signature made Thu 21 Nov 2019 03:34:55 PM MST
# gpg:                using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4  753F 0F56 D055 3B6D 411B
#      Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC  248B 695B 7AE4 BF06 6240

1 files changed, 7 insertions, 4 deletions

diff --git a/email-print-mime-structure b/email-print-mime-structure
index 4f165b1..27fb532 100755
--- a/email-print-mime-structure
+++ b/email-print-mime-structure
@@ -78,15 +78,16 @@ class MimePrinter(object):
             nbytes = len(payload)
 
         print(f'{prefix}{z.get_content_type()}{cset}{disposition}{fname} {nbytes:d} bytes')
-        try_decrypt:bool = self.args.pgpkey or self.args.use_gpg_agent
+        cryptopayload:Optional[Message] = None
+        ciphertext:Union[List[Message],str,bytes,None] = None
+        try_pgp_decrypt:bool = self.args.pgpkey or self.args.use_gpg_agent
 
-        if try_decrypt and \
+        if try_pgp_decrypt and \
            (parent is not None) and \
            (parent.get_content_type().lower() == 'multipart/encrypted') and \
            (str(parent.get_param('protocol')).lower() == 'application/pgp-encrypted') and \
            (num == 2):
-            cryptopayload:Optional[Message] = None
-            ciphertext:Union[List[Message],str,bytes,None] = z.get_payload()
+            ciphertext = z.get_payload()
             if not isinstance(ciphertext, str):
                 logging.warning('encrypted part was not a leaf mime part somehow')
                 return
@@ -97,6 +98,8 @@ class MimePrinter(object):
             if cryptopayload is None:
                 logging.warning(f'Unable to decrypt')
                 return
+
+        if cryptopayload is not None:
             newprefix = prefix[:-3] + ' '
             print(f'{newprefix}↧ (decrypts to)')
             self.print_tree(cryptopayload, newprefix + '└', z, 0)