# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1508281422 -7200
# Node ID 6250dc100911e7ebf2e888cfb7dee599f257eb17
# Parent  80ff4874ce5082856a637f1386641e62c03aefa9
Allow the store, journal and publisher configuration logic to function correctly
by not retrieving the defaults when obtaining command line arguments.
Extended the configuration debugging option output.

diff -r 80ff4874ce50 -r 6250dc100911 imiptools/__init__.py
--- a/imiptools/__init__.py	Wed Oct 18 00:58:00 2017 +0200
+++ b/imiptools/__init__.py	Wed Oct 18 01:03:42 2017 +0200
@@ -153,11 +153,11 @@
 
         # Obtain arguments or configured defaults.
 
-        self.store_type = args.get("store_type") or settings["STORE_TYPE"]
-        self.store_dir = args.get("store_dir") or settings["STORE_DIR"]
-        self.journal_dir = args.get("journal_dir") or settings["JOURNAL_DIR"]
+        self.store_type = args.get("store_type")
+        self.store_dir = args.get("store_dir")
+        self.journal_dir = args.get("journal_dir")
         self.preferences_dir = args.get("preferences_dir") or settings["PREFERENCES_DIR"]
-        self.publishing_dir = args.get("publishing_dir") or settings["PUBLISH_DIR"]
+        self.publishing_dir = args.get("publishing_dir")
 
         self.messenger = Messenger(lmtp_socket=args["lmtp"],
                                    local_smtp=args["local_smtp"],
@@ -167,13 +167,17 @@
 
         if args["show_config"]:
             print """\
-Store type: %s
-Store directory: %s
-Journal directory: %s
+Store type: %s (%s)
+Store directory: %s (%s)
+Journal directory: %s (%s)
 Preferences directory: %s
-Publishing directory: %s""" % (
-                self.store_type, self.store_dir, self.journal_dir,
-                self.preferences_dir, self.publishing_dir)
+Publishing directory: %s (%s)
+""" % (
+                self.store_type, settings["STORE_TYPE"],
+                self.store_dir, settings["STORE_DIR"],
+                self.journal_dir, settings["JOURNAL_DIR"],
+                self.preferences_dir,
+                self.publishing_dir, settings["PUBLISH_DIR"])
             return
 
         # If debug mode is set, extend the line length for convenience.