ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject incubator-ponymail git commit: Fix broken import check
Date Fri, 04 Nov 2016 03:00:50 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 51c228104 -> e4ed1fbe3


Fix broken import check

For the import check to be effective, it must be before archiver is
imported, as that imports them as well

Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/e4ed1fbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/e4ed1fbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/e4ed1fbe

Branch: refs/heads/master
Commit: e4ed1fbe3dc871d7000cecc7c97a1fc27b5689a6
Parents: 51c2281
Author: Sebb <sebb@apache.org>
Authored: Fri Nov 4 03:00:40 2016 +0000
Committer: Sebb <sebb@apache.org>
Committed: Fri Nov 4 03:00:40 2016 +0000

----------------------------------------------------------------------
 tools/import-mbox.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/e4ed1fbe/tools/import-mbox.py
----------------------------------------------------------------------
diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index 72c4494..f9bd4aa 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -34,14 +34,16 @@ import glob
 import multiprocessing
 import tempfile
 import gzip
-import archiver
 
 try:
     from elasticsearch import Elasticsearch, helpers
-    from formatflowed import convertToWrapped
+    from formatflowed import convertToWrapped # only needed by archiver
 except:
     print("Sorry, you need to install the elasticsearch and formatflowed modules from pip
first.")
     sys.exit(-1)
+
+# must be done after import check above
+import archiver
     
 y = 0
 baddies = 0


Mime
View raw message