Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / PRESUBMIT.py

diff --git a/src/chrome/common/extensions/PRESUBMIT.py b/src/chrome/common/extensions/PRESUBMIT.py
index 2e138c9..08ff3a5 100644 (file)
--- a/src/chrome/common/extensions/PRESUBMIT.py
+++ b/src/chrome/common/extensions/PRESUBMIT.py
@@ -48,7 +48,9 @@ def _FindMatchingTemplates(template_name, template_path_list):
   unix_name = _UnixName(template_name)
   for template in template_path_list:
     if unix_name == _UnixName(template.split(os.sep)[-1]):
-      matches.append(template)
+      # The docserver expects clean (extensionless) template URLs, so we strip
+      # extensions here when generating the list of matches.
+      matches.append(os.path.splitext(template)[0])
   return matches
 
 def _SanitizeAPIName(name, api_path):
@@ -153,7 +155,10 @@ def _CheckChange(input_api, output_api):
   return results
 
 def CheckChangeOnUpload(input_api, output_api):
-  return _CheckChange(input_api, output_api)
+  results = []
+  results += input_api.canned_checks.CheckPatchFormatted(input_api, output_api)
+  results += _CheckChange(input_api, output_api)
+  return results
 
 def CheckChangeOnCommit(input_api, output_api):
   return _CheckChange(input_api, output_api)