1.1 --- a/imiptools/__init__.py Wed Oct 18 00:58:00 2017 +0200
1.2 +++ b/imiptools/__init__.py Wed Oct 18 01:03:42 2017 +0200
1.3 @@ -153,11 +153,11 @@
1.4
1.5 # Obtain arguments or configured defaults.
1.6
1.7 - self.store_type = args.get("store_type") or settings["STORE_TYPE"]
1.8 - self.store_dir = args.get("store_dir") or settings["STORE_DIR"]
1.9 - self.journal_dir = args.get("journal_dir") or settings["JOURNAL_DIR"]
1.10 + self.store_type = args.get("store_type")
1.11 + self.store_dir = args.get("store_dir")
1.12 + self.journal_dir = args.get("journal_dir")
1.13 self.preferences_dir = args.get("preferences_dir") or settings["PREFERENCES_DIR"]
1.14 - self.publishing_dir = args.get("publishing_dir") or settings["PUBLISH_DIR"]
1.15 + self.publishing_dir = args.get("publishing_dir")
1.16
1.17 self.messenger = Messenger(lmtp_socket=args["lmtp"],
1.18 local_smtp=args["local_smtp"],
1.19 @@ -167,13 +167,17 @@
1.20
1.21 if args["show_config"]:
1.22 print """\
1.23 -Store type: %s
1.24 -Store directory: %s
1.25 -Journal directory: %s
1.26 +Store type: %s (%s)
1.27 +Store directory: %s (%s)
1.28 +Journal directory: %s (%s)
1.29 Preferences directory: %s
1.30 -Publishing directory: %s""" % (
1.31 - self.store_type, self.store_dir, self.journal_dir,
1.32 - self.preferences_dir, self.publishing_dir)
1.33 +Publishing directory: %s (%s)
1.34 +""" % (
1.35 + self.store_type, settings["STORE_TYPE"],
1.36 + self.store_dir, settings["STORE_DIR"],
1.37 + self.journal_dir, settings["JOURNAL_DIR"],
1.38 + self.preferences_dir,
1.39 + self.publishing_dir, settings["PUBLISH_DIR"])
1.40 return
1.41
1.42 # If debug mode is set, extend the line length for convenience.