diff options
| author | Eugeni Dodonov <eugeni@mandriva.org> | 2010-01-29 14:42:31 +0000 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.org> | 2010-01-29 14:42:31 +0000 |
| commit | 148dc78cd3bf63dbc20ea8b4c13bf7ffc8b47745 (patch) | |
| tree | 390d516b726b1b8ce66245240d566a14ca52f5e1 /src/msec/msec.py | |
| parent | 72b974639ca0bd1f83761ddf3859861929239b27 (diff) | |
| download | msec-148dc78cd3bf63dbc20ea8b4c13bf7ffc8b47745.tar msec-148dc78cd3bf63dbc20ea8b4c13bf7ffc8b47745.tar.gz msec-148dc78cd3bf63dbc20ea8b4c13bf7ffc8b47745.tar.bz2 msec-148dc78cd3bf63dbc20ea8b4c13bf7ffc8b47745.tar.xz msec-148dc78cd3bf63dbc20ea8b4c13bf7ffc8b47745.zip | |
Properly handle base levels in msecgui and with deleted parameters.
Diffstat (limited to 'src/msec/msec.py')
| -rwxr-xr-x | src/msec/msec.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/msec/msec.py b/src/msec/msec.py index 3f3d489..556a082 100755 --- a/src/msec/msec.py +++ b/src/msec/msec.py @@ -156,6 +156,12 @@ if __name__ == "__main__": else: msec_config.load() + # load base levels + baselevel_name = msec_config.get_base_level() + if baselevel_name: + levelconf = config.load_defaults(log, baselevel_name, root=root) + standard_permconf = config.load_default_perms(log, baselevel_name, root=root) + # load variables from base levels config.merge_with_baselevel(log, msec_config, msec_config.get_base_level(), config.load_defaults, root='') config.merge_with_baselevel(log, permconf, msec_config.get_base_level(), config.load_default_perms, root='') @@ -181,7 +187,7 @@ if __name__ == "__main__": # writing back changes msec.commit(commit) # saving updated config - if force_level and commit: + if commit: if not msec_config.save(levelconf): log.error(_("Unable to save config!")) if not permconf.save(standard_permconf): |