1.1 --- a/imiptools/__init__.py Wed Oct 18 00:19:26 2017 +0200
1.2 +++ b/imiptools/__init__.py Wed Oct 18 00:58:00 2017 +0200
1.3 @@ -64,9 +64,9 @@
1.4
1.5 def get_store(self):
1.6
1.7 - "Return any configured store or None if not explicitly configured."
1.8 + "Return any configured store."
1.9
1.10 - return self.store_dir and get_store(self.store_type, self.store_dir) or None
1.11 + return get_store(self.store_type, self.store_dir)
1.12
1.13 def get_publisher(self):
1.14
2.1 --- a/imiptools/stores/__init__.py Wed Oct 18 00:19:26 2017 +0200
2.2 +++ b/imiptools/stores/__init__.py Wed Oct 18 00:58:00 2017 +0200
2.3 @@ -32,8 +32,11 @@
2.4 configuration defaults where the parameters are given as None.
2.5 """
2.6
2.7 - return stores[store_type or settings["STORE_TYPE"]].Store(
2.8 - store_dir or settings["STORE_DIR"])
2.9 + if store_dir or not store_type or store_type == settings["STORE_TYPE"]:
2.10 + return stores[store_type or settings["STORE_TYPE"]].Store(
2.11 + store_dir or settings["STORE_DIR"])
2.12 + else:
2.13 + raise StoreInitialisationError, "Store type cannot be changed arbitrarily."
2.14
2.15 def get_publisher(publishing_dir=None):
2.16
2.17 @@ -52,7 +55,10 @@
2.18 configuration defaults where the parameters are given as None.
2.19 """
2.20
2.21 - return stores[store_type or settings["STORE_TYPE"]].Journal(
2.22 - journal_dir or settings["JOURNAL_DIR"])
2.23 + if journal_dir or not store_type or store_type == settings["STORE_TYPE"]:
2.24 + return stores[store_type or settings["STORE_TYPE"]].Journal(
2.25 + journal_dir or settings["JOURNAL_DIR"])
2.26 + else:
2.27 + raise StoreInitialisationError, "Journal type cannot be changed arbitrarily."
2.28
2.29 # vim: tabstop=4 expandtab shiftwidth=4