Merge pull request #120 from crocs-muni/fix/fips_cli_configpath

Fix bad config path load in fips_cli.py

2 files changed, 5 insertions, 5 deletions

diff --git a/fips_cli.py b/fips_cli.py
index 88268ce6..f5b9cbdd 100755
--- a/fips_cli.py
+++ b/fips_cli.py
@@ -7,7 +7,7 @@ import sys
 import os
 from datetime import datetime
 
-from sec_certs.config.configuration import config
+from sec_certs.config.configuration import config, DEFAULT_CONFIG_PATH
 from sec_certs.dataset.fips import FIPSDataset
 
 logger = logging.getLogger(__name__)
@@ -143,8 +143,7 @@ def main(
         except ValueError as e:
             print(f"Error: Bad format of configuration file: {e}")
     else:
-        print(f"Using default configuration file at {Path(script_dir) / 'sec_certs' / 'settings.yaml'}")
-        config.load(Path(script_dir) / 'sec_certs' / 'settings.yaml')
+        print(f"Using default configuration file at {DEFAULT_CONFIG_PATH}.")
 
     if "all" in actions and "new-run" in actions:
         print("Error: Only one of 'new-run' and 'all' can be specified.")
diff --git a/sec_certs/config/configuration.py b/sec_certs/config/configuration.py
index 7a3b8831..670d8cc9 100644
--- a/sec_certs/config/configuration.py
+++ b/sec_certs/config/configuration.py
@@ -23,6 +23,7 @@ class Configuration(object):
         for k, v in state.items():
             setattr(self, k, v)
 
+
     def __getattribute__(self, key):
         res = object.__getattribute__(self, key)
         if isinstance(res, dict) and 'value' in res:
@@ -30,6 +31,6 @@ class Configuration(object):
         return object.__getattribute__(self, key)
 
 
-config_path = Path(__file__).parent / 'settings.yaml'
+DEFAULT_CONFIG_PATH = Path(__file__).parent / 'settings.yaml'
 config = Configuration()
-config.load(config_path)
+config.load(DEFAULT_CONFIG_PATH)