diff options
author | Dan Egnor <egnor@google.com> | 2010-03-17 16:59:12 -0700 |
---|---|---|
committer | Dan Egnor <egnor@google.com> | 2010-03-17 16:59:12 -0700 |
commit | 5fe3b35846bd1a0abfee68091daf58d7d92e51ba (patch) | |
tree | aef9a8277cc982e785ba5963bdbbb6ce1d5a20f0 /tools/merge-event-log-tags.py | |
parent | 8c254825a062fd240566404d9d6ecc7cc56b30ba (diff) | |
download | build-5fe3b35846bd1a0abfee68091daf58d7d92e51ba.zip build-5fe3b35846bd1a0abfee68091daf58d7d92e51ba.tar.gz build-5fe3b35846bd1a0abfee68091daf58d7d92e51ba.tar.bz2 |
Allow explicit and implicit numbering of the same tag.
Change-Id: I59c24cc211250da7e0aed9e0b0aa16517fd72d55
Diffstat (limited to 'tools/merge-event-log-tags.py')
-rwxr-xr-x | tools/merge-event-log-tags.py | 6 |
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 |