diff options
| author | Martin Nagy <mnagy@redhat.com> | 2008-10-02 20:24:05 +0200 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-02 17:22:41 -0600 |
| commit | 149429f3057e3ae934e660e3276c9e8d3c935d17 (patch) | |
| tree | 8110fe604c94f70275991e483889b94b8e226afd /ipalib/cli.py | |
| parent | 6000b6b5c62181d25783b6d45adb2ed6f3928480 (diff) | |
| download | freeipa.git-149429f3057e3ae934e660e3276c9e8d3c935d17.tar.gz freeipa.git-149429f3057e3ae934e660e3276c9e8d3c935d17.tar.xz freeipa.git-149429f3057e3ae934e660e3276c9e8d3c935d17.zip | |
Environment is now subclassed from object, rather then dict. Added tests for Environment and config.py
Diffstat (limited to 'ipalib/cli.py')
| -rw-r--r-- | ipalib/cli.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index 1a08cef4..d66e1e2e 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -29,8 +29,7 @@ import frontend import errors import plugable import ipa_types - -from ipalib import config +import config def exit_error(error): sys.exit('ipa: ERROR: %s' % error) @@ -257,9 +256,7 @@ class CLI(object): self.print_commands() print 'Usage: ipa COMMAND' sys.exit(2) - # do parsing here, read the conf - conf_dict = config.read_config(self.api.env.conf) - self.api.env.update(conf_dict) + self.api.env.update(config.generate_env()) key = sys.argv[1] if key not in self: self.print_commands() |