Add commandline options for configuration files.

[matthijs/projects/backupninja.git] / src / lib / backupninja / config.py

diff --git a/src/lib/backupninja/config.py b/src/lib/backupninja/config.py
index af3d4dae3b7ddda15d3b4b22a1328eddfb93571e..0246efe11e34adc02104f5d8f67de6be4ff44a39 100644 (file)
--- a/src/lib/backupninja/config.py
+++ b/src/lib/backupninja/config.py
@@ -37,7 +37,7 @@ def get_global_config(opts):
 
     opts are the parsed commandline options.
     """
-    global_config = os.path.join(default_config_dir, default_global_config)
+    global_config = os.path.join(opts.config_dir, opts.global_config)
     return _load_config(global_config)
 
 def get_action_config(opts, action):
@@ -48,7 +48,7 @@ def get_action_config(opts, action):
 
     opts are the parsed commandline options.
     """
-    actions_dir = os.path.join(default_config_dir, default_actions_dir)
+    actions_dir = os.path.join(opts.config_dir, opts.actions_dir)
     return _load_config(os.path.join(actions_dir, action))
 
 def list_actions(opts):
@@ -57,7 +57,7 @@ def list_actions(opts):
     list of action names that can be passed to get_action_config.
     opts are the parsed commandline options.
     """
-    actions_dir = os.path.join(default_config_dir, default_actions_dir)
+    actions_dir = os.path.join(opts.config_dir, opts.actions_dir)
     return os.listdir(actions_dir)
     
 def _load_config(filename):