summaryrefslogtreecommitdiffstats
path: root/tools/merge-event-log-tags.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/merge-event-log-tags.py')
-rwxr-xr-xtools/merge-event-log-tags.py6
1 files changed, 6 insertions, 0 deletions
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 @@ for fn in args:
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