Allow explicit and implicit numbering of the same tag.
Change-Id: I59c24cc211250da7e0aed9e0b0aa16517fd72d55
diff --git a/tools/merge-event-log-tags.py b/tools/merge-event-log-tags.py
index 25ac697..df9ebce 100755
--- a/tools/merge-event-log-tags.py
+++ b/tools/merge-event-log-tags.py
@@ -82,6 +82,12 @@
if t.tagname in by_tagname:
orig = by_tagname[t.tagname]
+ # Allow an explicit tag number to define an implicit tag number
+ if orig.tagnum is None:
+ orig.tagnum = t.tagnum
+ elif t.tagnum is None:
+ t.tagnum = orig.tagnum
+
if (t.tagnum == orig.tagnum and
t.description == orig.description):
# if the name and description are identical, issue a warning