incubator-ponymail git commit: Allow dry-run to continue without database connection

[se...@apache.org]

Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 832c7c3ca -> f593020a6


Allow dry-run to continue without database connection

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

Branch: refs/heads/master
Commit: f593020a6db6a13a756747ff51a8950eb54d640e
Parents: 832c7c3
Author: Sebb <se...@apache.org>
Authored: Thu Nov 17 15:58:45 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Thu Nov 17 15:58:45 2016 +0000

----------------------------------------------------------------------
 tools/import-mbox.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f593020a/tools/import-mbox.py
----------------------------------------------------------------------
diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index bad5965..b59e924 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -425,12 +425,18 @@ logging.getLogger("elasticsearch").setLevel(logging.ERROR)
 try:
     if not es.indices.exists(dbname):
         print("Error: the index '%s' does not exist!" % (dbname))
-        sys.exit(1)
+        if args.dry:
+            print("Dry-run; continuing to check input data")
+        else:
+            sys.exit(1)
+    print("Database exists OK")
 except Exception as err:
     print("Error: unable to check if the index %s exists!: %s" % (dbname, err))
-    sys.exit(1)
+    if args.dry:
+        print("Dry-run; continuing to check input data")
+    else:
+        sys.exit(1)
 
-print("Database exists OK")
 
 def globDir(d):
     dirs = [ f for f in listdir(d) if isdir(join(d,f)) ]