diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-12-29 21:23:34 -0700 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-12-29 21:23:34 -0700 |
| commit | e14fc84dfccbb06f775bbd5d3de864c7b879453f (patch) | |
| tree | 2353b693576fee859a7966be9f19c24192b410f2 /ipalib/config.py | |
| parent | 7766f0be6189c06c3cbbdef59bdbf4eb2a65e2a1 (diff) | |
| download | freeipa-e14fc84dfccbb06f775bbd5d3de864c7b879453f.tar.gz freeipa-e14fc84dfccbb06f775bbd5d3de864c7b879453f.tar.xz freeipa-e14fc84dfccbb06f775bbd5d3de864c7b879453f.zip | |
Renamed Env._merge_config() to Env._merge_from_file()
Diffstat (limited to 'ipalib/config.py')
| -rw-r--r-- | ipalib/config.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index dc5d35f8b..6b0165415 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -334,8 +334,8 @@ class Env(object): self.__doing('_finalize_core') self.__do_if_not_done('_bootstrap') if self.__d.get('mode', None) != 'dummy': - self._merge_config(self.conf) - self._merge_config(self.conf_default) + self._merge_from_file(self.conf) + self._merge_from_file(self.conf_default) if 'in_server' not in self: self.in_server = (self.context == 'server') if 'log' not in self: @@ -371,7 +371,7 @@ class Env(object): self[key] = value self.__lock__() - def _merge_config(self, conf_file): + def _merge_from_file(self, conf_file): """ Merge values from ``conf_file`` into this `Env`. """ |