X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fbackupninja.git;a=blobdiff_plain;f=src%2Flib%2Fbackupninja%2Fconfig.py;h=df38122b5169b2a43aead47f60034721bd11f63b;hp=af3d4dae3b7ddda15d3b4b22a1328eddfb93571e;hb=7a6692ef5f50f18d92b53095ab09fb2f046bccbe;hpb=38783916e32faa5653f43620f9e31acc9418721e

diff --git a/src/lib/backupninja/config.py b/src/lib/backupninja/config.py
index af3d4da..df38122 100644
--- 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,8 +57,8 @@ 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)
-    return os.listdir(actions_dir)
+    actions_dir = os.path.join(opts.config_dir, opts.actions_dir)
+    return [f for f in os.listdir(actions_dir) if not f.startswith('.')]
     
 def _load_config(filename):
     # Open a file and read it