diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 05:18:58 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 05:18:58 +0000 |
| commit | fb40ec7a037ca4da04eb2d3eafe418bd18df59a1 (patch) | |
| tree | 084bb8f74454fc7b32f79b27aae72d615c0aaac6 /tools | |
| parent | 6b1d04b133564ed10b434bbfc42736e57144a1e5 (diff) | |
| download | chromium_src-fb40ec7a037ca4da04eb2d3eafe418bd18df59a1.zip chromium_src-fb40ec7a037ca4da04eb2d3eafe418bd18df59a1.tar.gz chromium_src-fb40ec7a037ca4da04eb2d3eafe418bd18df59a1.tar.bz2 | |
Fix a bug that surfaced when two nodes with the same ID have
use_name_for_id=true set. We want to ignore the nodes that
don't apply for this platform.
Fixing on trunk first then will copy to the 306 branch with drover.
BUG=32868
Review URL: http://codereview.chromium.org/552176
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/grit/grit/node/message.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/grit/grit/node/message.py b/tools/grit/grit/node/message.py index 8cdf0ef..2dfd0ec 100644 --- a/tools/grit/grit/node/message.py +++ b/tools/grit/grit/node/message.py @@ -147,7 +147,8 @@ class MessageNode(base.ContentNode): description_or_id = 'ID: %s' % self.attrs['name'] assigned_id = None - if self.attrs['use_name_for_id'] == 'true': + if (self.attrs['use_name_for_id'] == 'true' and + self.SatisfiesOutputCondition()): assigned_id = self.attrs['name'] message = tclib.Message(text=text, placeholders=placeholders, description=description_or_id, |