diff options
| author | Martin Nagy <mnagy@redhat.com> | 2008-10-03 22:13:50 +0200 |
|---|---|---|
| committer | Martin Nagy <mnagy@redhat.com> | 2008-10-08 00:07:44 +0200 |
| commit | 4a1c4a3fe3a568c98b6bab1456993c4163721c5d (patch) | |
| tree | 926f649b63de97596863c1b57f1375f0950053e5 /ipalib/config.py | |
| parent | 4a68c719f03c176bc63a96007c089d0ac7ae5fc1 (diff) | |
| download | freeipa-4a1c4a3fe3a568c98b6bab1456993c4163721c5d.tar.gz freeipa-4a1c4a3fe3a568c98b6bab1456993c4163721c5d.tar.xz freeipa-4a1c4a3fe3a568c98b6bab1456993c4163721c5d.zip | |
Implement argument parsing for the CLI
Diffstat (limited to 'ipalib/config.py')
| -rw-r--r-- | ipalib/config.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index 16bc13714..a0a33b401 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -28,6 +28,7 @@ def generate_env(d={}): server_context = False, query_dns = True, verbose = False, + interactive = True, server = LazyIter(get_servers), realm = LazyProp(get_realm), domain = LazyProp(get_domain), @@ -70,11 +71,14 @@ class LazyIter(LazyProp): yield item -def read_config(config_file=DEFAULT_CONF): - assert isinstance(config_file, (basestring, file)) +def read_config(config_file=None): + assert config_file == None or isinstance(config_file, (basestring, file)) parser = SafeConfigParser() - files = [config_file, os.path.expanduser('~/.ipa.conf')] + if config_file == None: + files = [DEFAULT_CONF, os.path.expanduser('~/.ipa.conf')] + else: + files = [config_file] for f in files: try: |