home
/
dev
/
repositories
/
mpd-sima.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ae3d6a
)
Fixed var_dir cli overriding (regression)
author
kaliko <kaliko@azylum.org>
Tue, 10 Jun 2014 15:32:01 +0000
(17:32 +0200)
committer
kaliko <kaliko@azylum.org>
Tue, 10 Jun 2014 15:32:01 +0000
(17:32 +0200)
sima/utils/config.py
patch
|
blob
|
history
diff --git
a/sima/utils/config.py
b/sima/utils/config.py
index cdaefd198022a23bf71d54300383dd80623a1937..e9da8f8f4c245f72b38a27f58f4e97df654c0002 100644
(file)
--- a/
sima/utils/config.py
+++ b/
sima/utils/config.py
@@
-119,6
+119,8
@@
class ConfMan(object): # CONFIG MANAGER CLASS
## INIT CALLS
self.init_config()
self.supersedes_config_with_cmd_line_options()
+ # generate dbfile
+ self.config['sima']['db_file'] = join(self.config['sima']['var_dir'], 'sima.db')
def get_pw(self):
try:
@@
-208,7
+210,6
@@
class ConfMan(object): # CONFIG MANAGER CLASS
## Sima sqlite DB
self.config['sima']['var_dir'] = join(data_dir)
- self.config['sima']['db_file'] = join(data_dir, 'sima.db')
# If no conf file present, uses defaults
if not isfile(self.conf_file):