x/deb-os-collect-config
Code Issues Proposed changes

better error messaging.

Browse Source
This commit is contained in:
Tim Miller 2013-01-29 12:34:00 -08:00
parent dab1539983
commit 598e4760db
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cornfig/cornfig.py
View File

@ -55,7 +55,10 @@ def render_executable(path, config):
raise CornfigException("config script failed: %s\n\nwith output:\n\n%s" % (path, e.output)) raise CornfigException("config script failed: %s\n\nwith output:\n\n%s" % (path, e.output))
def read_config(path): def read_config(path):
return json.loads(open(path).read()) try:
return json.loads(open(path).read())
except:
raise CornfigException("invalid metadata file: %s" % path)
# flatten a nested hash into a one-level hash # flatten a nested hash into a one-level hash
# {x: {a: b} } => {x.a: b} # {x: {a: b} } => {x.a: b}
@ -103,7 +106,7 @@ def main():
install_cornfig(options.metadata_path, options.template_root, options.out_root) install_cornfig(options.metadata_path, options.template_root, options.out_root)
except CornfigException as e: except CornfigException as e:
logging.error(e.message()) logging.error(e)
sys.exit(1) sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':

2
tests/cornfig_tests.py
View File

@ -83,7 +83,7 @@ def test_read_config():
t.flush() t.flush()
assert_equals( read_config(t.name), d ) assert_equals( read_config(t.name), d )
@raises(ValueError) @raises(CornfigException)
def test_read_config_bad_json(): def test_read_config_bad_json():
with tempfile.NamedTemporaryFile() as t: with tempfile.NamedTemporaryFile() as t:
t.write("{{{{") t.write("{{{{")