Allow saving a message or a subpart to more than one file

diff --git a/ChangeLog b/ChangeLog
index e8b77c948a192ea24e21e0fd37a9fac68fa16254..a63d023390b9dd485f4d6de80860fbf526e2a356 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Version 2.5.1 (2014-04-??)
 
    Open all files in binary mode. Output os.linesep instead of '\n'.
 
+   Test --save-headers|body|message masks one after another to allow
+   saving a message or a subpart to more than one file.
 
 Version 2.5.0 (2014-03-18)
 

diff --git a/mimedecode.py b/mimedecode.py
index 0714c874863da054c9f9b01f9b0a0e4d7958d551..6567e9926b562e0c7504cdd849c3ba183f447eba 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -364,9 +364,9 @@ def decode_part(msg):
     for content_type in masks:
         if content_type in g.save_headers_mask:
             _save_message(msg, outstring, save_headers=True, save_body=False)
-        elif content_type in g.save_body_mask:
+        if content_type in g.save_body_mask:
             _save_message(msg, outstring, save_headers=False, save_body=True)
-        elif content_type in g.save_message_mask:
+        if content_type in g.save_message_mask:
             _save_message(msg, outstring, save_headers=True, save_body=True)
 
     for content_type in masks: