[incubator-ponymail] branch master updated: Setting archiver.archive_generator doesn't work

[sebb]

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 ae39439  Setting archiver.archive_generator doesn't work
ae39439 is described below

commit ae39439e56d84cd85e853b53fc8e6d3592afe837
Author: Sebb <s...@apache.org>
AuthorDate: Sun Aug 16 11:16:30 2020 +0100

    Setting archiver.archive_generator doesn't work
    
    This is because the default value is taken from the field too early
---
 tools/import-mbox.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index 201988f..33eccf2 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -122,7 +122,10 @@ class SlurpThread(Thread):
         mboxfile = ""
         filename = ""
 
-        archie = archiver.Archiver(parse_html=parseHTML)
+        if args.generator:
+            archie = archiver.Archiver(generator=args.generator, 
parse_html=parseHTML)            
+        else:
+            archie = archiver.Archiver(parse_html=parseHTML)            
 
         while len(lists) > 0:
             self.printid("%u elements left to slurp" % len(lists))
@@ -456,9 +459,6 @@ else:
         print("Error: unable to check if the index %s exists!: %s" % (dbname, 
err))
         sys.exit(1)
 
-if args.generator:
-    archiver.archiver_generator = args.generator
-
 def globDir(d):
     dirs = [ f for f in listdir(d) if isdir(join(d,f)) ]
     mboxes = [ f for f in glob.glob(join(d,"*" + extension)) if isfile(f) ]