Bug 1317313 - Unbust todays Android Aurora Nightly (post merge-day) by adding more to whitelist, and fixing regex. r=Tomcat r=mshal a=tomcat for CLOSED TREE
authorJustin Wood <Callek@gmail.com>
Mon, 14 Nov 2016 10:56:37 -0500
changeset 352427 f11ca24b2382ed6c8c7970a82fff53f7f3e0aa6d
parent 352426 8cdff71808a0e11361bca7f218658c4343c730ca
child 352428 aeb8bcaafe56ee681cf19a13398cd14d163af6ca
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersTomcat, mshal, tomcat
bugs1317313
milestone52.0a2
Bug 1317313 - Unbust todays Android Aurora Nightly (post merge-day) by adding more to whitelist, and fixing regex. r=Tomcat r=mshal a=tomcat for CLOSED TREE MozReview-Commit-ID: BaSzx54qSZ8
mobile/android/installer/allowed-dupes.mn
toolkit/mozapps/installer/find-dupes.py
--- a/mobile/android/installer/allowed-dupes.mn
+++ b/mobile/android/installer/allowed-dupes.mn
@@ -3,32 +3,68 @@
 # See bug 1303184
 #
 # PLEASE DO NOT ADD MORE EXCEPTIONS TO THIS LIST
 #
 
 # For android multilocale; see bug 1313702
 chrome/en-US/locale/branding/brand.dtd
 chrome/en-US/locale/branding/brand.properties
+chrome/en-US/locale/en-US/browser/aboutAccounts.dtd
+chrome/en-US/locale/en-US/browser/aboutAccounts.properties
+chrome/en-US/locale/en-US/browser/aboutAddons.dtd
+chrome/en-US/locale/en-US/browser/aboutAddons.properties
+chrome/en-US/locale/en-US/browser/aboutDownloads.dtd
+chrome/en-US/locale/en-US/browser/aboutDownloads.properties
 chrome/en-US/locale/en-US/browser/aboutHealthReport.dtd
 chrome/en-US/locale/en-US/browser/aboutHome.dtd
+chrome/en-US/locale/en-US/browser/aboutHome.properties
+chrome/en-US/locale/en-US/browser/aboutLogins.dtd
+chrome/en-US/locale/en-US/browser/aboutLogins.properties
 chrome/en-US/locale/en-US/browser/checkbox.dtd
+chrome/en-US/locale/en-US/browser/config.dtd
+chrome/en-US/locale/en-US/browser/config.properties
 chrome/en-US/locale/en-US/browser/devicePrompt.properties
+chrome/en-US/locale/en-US/browser/handling.properties
+chrome/en-US/locale/en-US/browser/passwordmgr.properties
+chrome/en-US/locale/en-US/browser/phishing.dtd
+chrome/en-US/locale/en-US/browser/sync.properties
 chrome/en-US/locale/en-US/browser/overrides/aboutAbout.dtd
 chrome/en-US/locale/en-US/browser/overrides/global.dtd
 chrome/en-US/locale/en-US/browser/overrides/global/mozilla.dtd
 chrome/en-US/locale/en-US/browser/overrides/intl.css
 chrome/en-US/locale/en-US/browser/region.properties
+chrome/en-US/locale/en-US/browser/webcompatReporter.properties
+chrome/en-US/locale/en-US/browser/searchplugins/amazon-co-uk.xml
+chrome/en-US/locale/en-US/browser/searchplugins/amazon-de.xml
+chrome/en-US/locale/en-US/browser/searchplugins/amazon-en-GB.xml
+chrome/en-US/locale/en-US/browser/searchplugins/amazon-in.xml
 chrome/en-US/locale/en-US/browser/searchplugins/amazondotcom.xml
+chrome/en-US/locale/en-US/browser/searchplugins/bolcom-fy-NL.xml
+chrome/en-US/locale/en-US/browser/searchplugins/bolcom-nl.xml
 chrome/en-US/locale/en-US/browser/searchplugins/bing.xml
 chrome/en-US/locale/en-US/browser/searchplugins/duckduckgo.xml
 chrome/en-US/locale/en-US/browser/searchplugins/google-nocodes.xml
 chrome/en-US/locale/en-US/browser/searchplugins/google.xml
+chrome/en-US/locale/en-US/browser/searchplugins/gulesider-mobile-NO.xml
+chrome/en-US/locale/en-US/browser/searchplugins/list.txt
 chrome/en-US/locale/en-US/browser/searchplugins/qwant.xml
+chrome/en-US/locale/en-US/browser/searchplugins/rediff.xml
 chrome/en-US/locale/en-US/browser/searchplugins/twitter.xml
+chrome/en-US/locale/en-US/browser/searchplugins/wikipedia.xml
+chrome/en-US/locale/en-US/browser/searchplugins/wikipedia-es.xml
+chrome/en-US/locale/en-US/browser/searchplugins/wikipedia-fr.xml
+chrome/en-US/locale/en-US/browser/searchplugins/wikipedia-hi.xml
+chrome/en-US/locale/en-US/browser/searchplugins/yahoo.xml
+chrome/en-US/locale/en-US/browser/searchplugins/yahoo-de.xml
+chrome/en-US/locale/en-US/browser/searchplugins/yahoo-en-GB.xml
+chrome/en-US/locale/en-US/browser/searchplugins/yahoo-es.xml
+chrome/en-US/locale/en-US/browser/searchplugins/yahoo-espanol.xml
+chrome/en-US/locale/en-US/browser/searchplugins/yahoo-france.xml
+chrome/en-US/locale/en-US/browser/searchplugins/yahoo-in.xml
 
 # Some of these are common with desktop
 chrome/en-US/locale/en-US/browser/overrides/AccessFu.properties
 chrome/en-US/locale/en-US/browser/overrides/about.dtd
 chrome/en-US/locale/en-US/browser/overrides/aboutReader.properties
 chrome/en-US/locale/en-US/browser/overrides/aboutRights.dtd
 chrome/en-US/locale/en-US/browser/overrides/charsetMenu.properties
 chrome/en-US/locale/en-US/browser/overrides/commonDialogs.properties
--- a/toolkit/mozapps/installer/find-dupes.py
+++ b/toolkit/mozapps/installer/find-dupes.py
@@ -33,21 +33,23 @@ def normalize_l10n_path(p):
     '''
     Normalizes localized paths to en-US
 
     >>> normalize_l10n_path('chrome/es-ES/locale/branding/brand.properties')
     'chrome/en-US/locale/branding/brand.properties'
     >>> normalize_l10n_path('chrome/fr/locale/fr/browser/aboutHome.dtd')
     'chrome/en-US/locale/en-US/browser/aboutHome.dtd'
     '''
-    p = re.sub(r'chrome/(\S+)/locale/\1',
-               'chrome/en-US/locale/en-US',
+    # Keep a trailing slash here! e.g. locales like 'br' can transform
+    # 'chrome/br/locale/branding/' into 'chrome/en-US/locale/en-USanding/'
+    p = re.sub(r'chrome/(\S+)/locale/\1/',
+               'chrome/en-US/locale/en-US/',
                p)
-    p = re.sub(r'chrome/(\S+)/locale',
-               'chrome/en-US/locale',
+    p = re.sub(r'chrome/(\S+)/locale/',
+               'chrome/en-US/locale/',
                p)
     return p
 
 
 def normalize_path(p):
     return normalize_osx_path(normalize_l10n_path(p))