diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-27 01:09:53 -0600 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-27 01:09:53 -0600 |
| commit | 25a7df9615058372b81a41df6baa2c4692df0063 (patch) | |
| tree | 2c9bc5bc5e43bb1ec9e94d6e272e808e94fe4277 /ipalib/config.py | |
| parent | 28dd8e74bdefd62307881f6e086af59db97a21a0 (diff) | |
| download | freeipa-25a7df9615058372b81a41df6baa2c4692df0063.tar.gz freeipa-25a7df9615058372b81a41df6baa2c4692df0063.tar.xz freeipa-25a7df9615058372b81a41df6baa2c4692df0063.zip | |
Env._finalize_core() now also loads config from Env.conf_default
Diffstat (limited to 'ipalib/config.py')
| -rw-r--r-- | ipalib/config.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index 7bb3e072a..538a97a7d 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -203,6 +203,8 @@ class Env(object): self.__doing('_finalize_core') self.__do_if_not_done('_bootstrap') self._merge_config(self.conf) + if self.conf_default != self.conf: + self._merge_config(self.conf_default) if 'in_server' not in self: self.in_server = (self.context == 'server') if 'log' not in self: |