projects
/
matthijs
/
projects
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config: Remove unused variables.
[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..1e29290d23fc229600c47776928d7013af66a1dd 100644
(file)
--- a/
src/lib/backupninja/config.py
+++ b/
src/lib/backupninja/config.py
@@
-23,9
+23,6
@@
import os, ConfigParser
import os, ConfigParser
-default_config_dir = '/etc/backupninja'
-default_global_config = 'backupninja.conf'
-default_actions_dir = 'actions'
import logging as log
import logging as log
@@
-37,7
+34,7
@@
def get_global_config(opts):
opts are the parsed commandline options.
"""
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):
return _load_config(global_config)
def get_action_config(opts, action):
@@
-48,7
+45,7
@@
def get_action_config(opts, action):
opts are the parsed commandline options.
"""
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):
return _load_config(os.path.join(actions_dir, action))
def list_actions(opts):
@@
-57,8
+54,8
@@
def list_actions(opts):
list of action names that can be passed to get_action_config.
opts are the parsed commandline options.
"""
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
def _load_config(filename):
# Open a file and read it