Default to pretty-printed YAML output
Signed-off-by: martin f. krafft <madduck@madduck.net>
diff --git a/reclass.py.in b/reclass.py.in
index 19c0aa1..4657624 100644
--- a/reclass.py.in
+++ b/reclass.py.in
@@ -31,8 +31,10 @@
config_file = f
break
try:
+ defaults = { 'pretty_print' : True, 'output' : 'yaml' }
options = reclass.config.get_options(__name__, __version__,
- __description__, config_file)
+ __description__, config_file,
+ defaults)
nodes_uri, classes_uri = reclass.config.path_mangler(options.inventory_base_uri,
options.nodes_uri,
options.classes_uri)
diff --git a/reclass/config.py b/reclass/config.py
index a19f834..7fcb2ad 100644
--- a/reclass/config.py
+++ b/reclass/config.py
@@ -79,11 +79,10 @@
else:
return {}
-def get_options(name, version, description, config_file=None):
- config_data = {}
+def get_options(name, version, description, config_file=None, defaults={}):
if config_file is not None:
- config_data.update(read_config_file(config_file))
- parser = _make_parser(name, version, description, config_data)
+ defaults.update(read_config_file(config_file))
+ parser = _make_parser(name, version, description, defaults)
return _parse_and_check_options(parser)
def path_mangler(inventory_base_uri, nodes_uri, classes_uri):