IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Env._finalize_core() now also loads config from Env.conf_default

Browse Source
This commit is contained in:
Jason Gerard DeRose
2008-10-27 01:09:53 -06:00
parent 28dd8e74bd
commit 25a7df9615
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipalib/config.py
View File

@@ -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: