From eb7c1cc5899dd9b476c3503f1b1a6402c4ac25c2 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Tue, 13 Nov 2018 14:38:26 -0800 Subject: [PATCH] parsedb: more verbose duplicate tag message Signed-off-by: John McMaster --- utils/parsedb.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/parsedb.py b/utils/parsedb.py index e3837798..50019426 100755 --- a/utils/parsedb.py +++ b/utils/parsedb.py @@ -5,7 +5,7 @@ from prjxray import util def run(fnin, fnout=None, strict=False, verbose=False): lines = open(fnin, 'r').read().split('\n') - tags = set() + tags = dict() bitss = set() for line in lines: line = line.strip() @@ -14,11 +14,13 @@ def run(fnin, fnout=None, strict=False, verbose=False): tag, bits, mode = util.parse_db_line(line) if strict: assert not mode, "strict: got ill defined line: %s" % (line, ) - assert tag not in tags, "strict: got duplicate tag %s (ex: %s)" % ( - tag, line) + if tag in tags: + print("Original line: %s" % tags[tag]) + print("New line: %s" % line) + assert 0, "strict: got duplicate tag %s" % (tag, ) assert bits not in bitss, "strict: got duplicate bits %s (ex: %s)" % ( bits, line) - tags.add(tag) + tags[tag] = line bitss.add(bits) if fnout: