Bug 1352690 - Remove exceptions for mobile/searchplugins from filter.py r?pike draft
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Sat, 01 Apr 2017 16:02:33 +0200
changeset 554701 2e7e952b0fdfea290bdf900f590aaa25567c355a
parent 554696 7bc9570270b395dc53be1739391cc34b42d1b834
child 622414 0a8189d3ab3d1666c63de652292cafbe9f9fb9a0
push id52024
push userbmo:francesco.lodolo@gmail.com
push dateSat, 01 Apr 2017 14:03:08 +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)):