Bug 1352690 - Remove exceptions for mobile/searchplugins from filter.py r=Pike
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Sat, 01 Apr 2017 16:02:33 +0200
changeset 555088 576a376acaf790baa346f9276d9835edeaf6db5c
parent 555087 e9336ce58b4e45e6b48313a0d19a3f3ed3ecc3d1
child 555089 13eb16dd02f4413140ff61da185ca3e633abfe9e
push id52150
push userbmo:ttromey@mozilla.com
push dateMon, 03 Apr 2017 16:18:54 +0000
reviewersPike
bugs1352690
milestone55.0a1
Bug 1352690 - Remove exceptions for mobile/searchplugins from filter.py r=Pike MozReview-Commit-ID: Em6BzWM4lqn
mobile/android/locales/filter.py
mobile/locales/filter.py
--- a/mobile/android/locales/filter.py
+++ b/mobile/android/locales/filter.py
@@ -58,18 +58,16 @@ def test(mod, path, entity = None):
           re.match(r"defines.inc", path)):
         return "ignore"
     if path == "defines.inc":
       if entity == "MOZ_LANGPACK_CONTRIBUTORS":
         return "ignore"
     return "error"
 
   # we're in mod == "mobile"
-  if re.match(r"searchplugins\/.+\.xml", path):
-    return "ignore"
   if path == "chrome/region.properties":
     # only region.properties exceptions remain
     if (re.match(r"browser\.search\.order\.[1-9]", entity) or
         re.match(r"browser\.search\.[a-zA-Z]+\.US", entity) or
         re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
         re.match(r"gecko\.handlerService\.schemes\.", entity) or
         re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity) or
         re.match(r"browser\.suggestedsites\.", entity)):
--- a/mobile/locales/filter.py
+++ b/mobile/locales/filter.py
@@ -58,18 +58,16 @@ def test(mod, path, entity = None):
           re.match(r"defines.inc", path)):
         return "ignore"
     if path == "defines.inc":
       if entity == "MOZ_LANGPACK_CONTRIBUTORS":
         return "ignore"
     return "error"
 
   # we're in mod == "mobile"
-  if re.match(r"searchplugins\/.+\.xml", path):
-    return "ignore"
   if path == "chrome/region.properties":
     # only region.properties exceptions remain
     if (re.match(r"browser\.search\.order\.[1-9]", entity) or
         re.match(r"browser\.search\.[a-zA-Z]+\.US", entity) or
         re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
         re.match(r"gecko\.handlerService\.schemes\.", entity) or
         re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity) or
         re.match(r"browser\.suggestedsites\.", entity)):