summaryrefslogtreecommitdiffstats
path: root/remoting/tools
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 18:30:26 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 18:30:26 +0000
commit098f45ca5c8ad9223f40decab738da8587999ff1 (patch)
tree30f86f4d25d719669f98dec716924bf28dd22607 /remoting/tools
parentd656e1042e3bc0cbe3f35ab34a193904763a2f8b (diff)
downloadchromium_src-098f45ca5c8ad9223f40decab738da8587999ff1.zip
chromium_src-098f45ca5c8ad9223f40decab738da8587999ff1.tar.gz
chromium_src-098f45ca5c8ad9223f40decab738da8587999ff1.tar.bz2
Fix warning when building remoting_webapp
The warning about unused PRODUCT_DESCRIPTION resource was introduced in r254355. R=jamiewalch@chromium.org Review URL: https://codereview.chromium.org/184823010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
-rwxr-xr-xremoting/tools/verify_resources.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/remoting/tools/verify_resources.py b/remoting/tools/verify_resources.py
index 1b082a5..b041af4 100755
--- a/remoting/tools/verify_resources.py
+++ b/remoting/tools/verify_resources.py
@@ -78,7 +78,7 @@ def ExtractTagFromLine(file_type, line):
if m: return m.group(1)
m = re.search('/\*i18n-content\*/["]([^\`"]*)["]', line)
if m: return m.group(1)
- elif file_type == 'json':
+ elif file_type == 'json.jinja2':
# Manifest style
m = re.search('__MSG_(.*)__', line)
if m: return m.group(1)
@@ -97,17 +97,19 @@ def VerifyFile(filename, messages, used_tags):
True.
"""
- base_name, extension = os.path.splitext(filename)
- extension = extension[1:]
- if extension not in ['js', 'cc', 'html', 'json', 'jinja2', 'mm']:
- raise Exception("Unknown file type: %s" % extension)
+ base_name, file_type = os.path.splitext(filename)
+ file_type = file_type[1:]
+ if file_type == 'jinja2' and base_name.endswith('.json'):
+ file_type = 'json.jinja2'
+ if file_type not in ['js', 'cc', 'html', 'json.jinja2', 'jinja2', 'mm']:
+ raise Exception("Unknown file type: %s" % file_type)
result = True
matches = False
f = open(filename, 'r')
lines = f.readlines()
for i in xrange(0, len(lines)):
- tag = ExtractTagFromLine(extension, lines[i])
+ tag = ExtractTagFromLine(file_type, lines[i])
if tag:
tag = tag.upper()
used_tags.add(tag)