From 25a7df9615058372b81a41df6baa2c4692df0063 Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Mon, 27 Oct 2008 01:09:53 -0600 Subject: Env._finalize_core() now also loads config from Env.conf_default --- ipalib/config.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ipalib/config.py') 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: -- cgit