diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-10-15 15:03:51 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-10-15 15:03:51 -0400 |
| commit | 0ceba59d87d0e3b2ecce623367b34a0dd339c1c4 (patch) | |
| tree | 1b2183c82851ec7b8b2f0925976e807e3db61be3 /ipalib/config.py | |
| parent | 264413bcb9d5adaeb6815565cd099ea06e43e532 (diff) | |
| download | freeipa-0ceba59d87d0e3b2ecce623367b34a0dd339c1c4.tar.gz freeipa-0ceba59d87d0e3b2ecce623367b34a0dd339c1c4.tar.xz freeipa-0ceba59d87d0e3b2ecce623367b34a0dd339c1c4.zip | |
Add Requires on ipa-client to ipa-admintools, ensure ipa client is configured
It makes little sense to install ipa-admintools without ipa-client, require it.
Also see if the client has been configured. This is a bit tricky since we
have a full set of defaults. Add a new env option that gets set if at least
one configuration file is loaded.
ticket 213
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 1dbd5b7ce..91a189642 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -389,6 +389,8 @@ class Env(object): if key not in self: self[key] = value i += 1 + if 'config_loaded' not in self: # we loaded at least 1 file + self['config_loaded'] = True return (i, len(items)) def _join(self, key, *parts): |