diff options
| author | Eugeni Dodonov <eugeni@mandriva.org> | 2010-01-29 14:41:43 +0000 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.org> | 2010-01-29 14:41:43 +0000 |
| commit | 65606235a6d2abc6c559ae22808c50738d3f67a0 (patch) | |
| tree | 1d16da118ba71c892ba4b56816d8e16186f00fed | |
| parent | 4181a939f7051e8dde7321cf69b9aab9b1babbf5 (diff) | |
| download | msec-65606235a6d2abc6c559ae22808c50738d3f67a0.tar msec-65606235a6d2abc6c559ae22808c50738d3f67a0.tar.gz msec-65606235a6d2abc6c559ae22808c50738d3f67a0.tar.bz2 msec-65606235a6d2abc6c559ae22808c50738d3f67a0.tar.xz msec-65606235a6d2abc6c559ae22808c50738d3f67a0.zip | |
simplify level loading
| -rwxr-xr-x | src/msec/msec.py | 3 | ||||
| -rwxr-xr-x | src/msec/msecperms.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/msec/msec.py b/src/msec/msec.py index ab3affb..c1cc75b 100755 --- a/src/msec/msec.py +++ b/src/msec/msec.py @@ -139,8 +139,7 @@ if __name__ == "__main__": sys.exit(1) log.info(_("Switching to '%s' level.") % level) msec_config.reset() - for opt in params: - msec_config.set(opt, levelconf.get(opt)) + msec_config.merge(levelconf, overwrite=True) else: msec_config.load() diff --git a/src/msec/msecperms.py b/src/msec/msecperms.py index f07b745..988be40 100755 --- a/src/msec/msecperms.py +++ b/src/msec/msecperms.py @@ -157,8 +157,7 @@ if __name__ == "__main__": sys.exit(1) log.info(_("Switching to '%s' level.") % level) permconf.reset() - for opt in params: - permconf.set(opt, standard_permconf.get(opt)) + permconf.merge(standard_permconf, overwrite=True) else: permconf.load() |