From 7c572ceec3f591bd2678a29d03c0a5cf6ccd74a8 Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 1 Sep 2021 23:35:57 -0400 Subject: [PATCH] Make changelog "invalid line" errors include filename and location e.g. for merge conflicts --- docs/sphinx_extensions/dfhack/changelog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py index 0818e2501..f7405d8b1 100644 --- a/docs/sphinx_extensions/dfhack/changelog.py +++ b/docs/sphinx_extensions/dfhack/changelog.py @@ -146,7 +146,7 @@ def parse_changelog(): '%s:%i: Sub-entry without parent' % (fpath, line_id)) last_entry.children.append(line.strip('- \n')) else: - raise ValueError('Invalid line: ' + line) + raise ValueError('%s:%i: Invalid line: %s' % (fpath, line_id, line)) if not entries: raise RuntimeError('No changelog files with contents found')