From: Oleg Broytman <phd@phdru.name>
Date: Wed, 12 Mar 2014 23:52:40 +0000 (+0400)
Subject: Raise error after saving the part
X-Git-Tag: v2.5.0~17
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=bd89029f8a4ae4c98c14e105c3e9e987c69d0805;p=mimedecode.git

Raise error after saving the part
---

diff --git a/mimedecode.py b/mimedecode.py
index 1e3bf74..1006fb4 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -341,7 +341,7 @@ def decode_part(msg):
             output("\nMessage body of type %s skipped.\n" % ctype)
             break
         elif content_type in g.error_mask:
-            raise ValueError, "content type %s prohibited" % ctype
+            break
     else:
         # Neither content type nor masks were listed - decode by default
         outstring = totext(msg, outstring)
@@ -354,6 +354,10 @@ def decode_part(msg):
         elif content_type in g.save_message_mask:
             _save_message(msg, outstring, save_headers=True, save_body=True)
 
+    for content_type in masks:
+        if content_type in g.error_mask:
+            raise ValueError, "content type %s prohibited" % ctype
+
 def decode_multipart(msg):
     "Decode multipart"