]> git.phdru.name Git - mimedecode.git/commitdiff
Raise error after saving the part
authorOleg Broytman <phd@phdru.name>
Wed, 12 Mar 2014 23:52:40 +0000 (03:52 +0400)
committerOleg Broytman <phd@phdru.name>
Wed, 12 Mar 2014 23:52:40 +0000 (03:52 +0400)
mimedecode.py

index 1e3bf74b3964717de33883c8b160c19db805f664..1006fb47768d8c9efc6c225eab9e8ebead50c2c9 100755 (executable)
@@ -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"