[incubator-ponymail] branch master updated: Also need to change import-mbox for new returns

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail.git


The following commit(s) were added to refs/heads/master by this push:
     new bc6f1d7  Also need to change import-mbox for new returns
bc6f1d7 is described below

commit bc6f1d712da8ea8068b86e4d5a822ba198244ecf
Author: Sebb <se...@apache.org>
AuthorDate: Fri May 25 18:26:21 2018 +0100

    Also need to change import-mbox for new returns
---
 tools/archiver.py    | 1 +
 tools/import-mbox.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 760a4f4..d97fde9 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -267,6 +267,7 @@ class Archiver(object): # N.B. Also used by import-mbox.py
                 
         return body    
 
+    # N.B. this is also called by import-mbox.py
     def compute_updates(self, lid, private, msg):
         """Determine what needs to be sent to the archiver.
 
diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index 93356e0..12d41b7 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -254,7 +254,7 @@ class SlurpThread(Thread):
                     bad += 1
                     continue
 
-                json, contents = archie.compute_updates(list_override, private, message)
+                json, contents, _msg_data, _irt = archie.compute_updates(list_override, private, message)
                 
                 # Not sure this can ever happen
                 if json and not (json['list'] and json['list_raw']):

-- 
To stop receiving notification emails like this one, please contact
sebb@apache.org.