From 5fe3b35846bd1a0abfee68091daf58d7d92e51ba Mon Sep 17 00:00:00 2001 From: Dan Egnor Date: Wed, 17 Mar 2010 16:59:12 -0700 Subject: [PATCH] Allow explicit and implicit numbering of the same tag. Change-Id: I59c24cc211250da7e0aed9e0b0aa16517fd72d55 --- tools/merge-event-log-tags.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/merge-event-log-tags.py b/tools/merge-event-log-tags.py index 25ac697dd..df9ebced1 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