From 1d4d439808555d9c29561ca7723f43cf95727f0a Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Sat, 10 Mar 2018 22:07:14 +0800 Subject: [PATCH] new: dev: ``YAML`` merge error have better reporting --- bin/compose | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/compose b/bin/compose index 2865349..411098a 100755 --- a/bin/compose +++ b/bin/compose @@ -191,7 +191,13 @@ def merge_cli(*args): try: c = merge(*args) except NotImplementedError as e: - sys.stderr.write('%s. Conflicting key is %r. Values are:\n%s\n' % (e.args[0], e.args[1], e.args[2])) + sys.stderr.write('Merging Failed: %s.\n%s\n' + ' Values are:\n %s\n' + % (e.args[0], + ' Conflicting key is %r.' % e.args[1] if e.args[1] else + ' Conflict at base of structure.', + '\\n '.join('v%d: %r' % (i, a) + for i, a in enumerate(e.args[2])))) exit(1) if c is not None: print '%s' % yaml.dump(c, default_flow_style=False)