From: kaliko <kaliko@azylum.org>
Date: Tue, 10 Jun 2014 15:32:01 +0000 (+0200)
Subject: Fixed var_dir cli overriding (regression)
X-Git-Tag: 0.12.0~10
X-Git-Url: https://git.kaliko.me/?a=commitdiff_plain;ds=sidebyside;h=f4bfa3663d95a4c03f1e626ae8a3b9aab59bb48c;p=mpd-sima.git

Fixed var_dir cli overriding (regression)
---

diff --git a/sima/utils/config.py b/sima/utils/config.py
index cdaefd1..e9da8f8 100644
--- 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):