Bug 1512882 - Fix detection of cZ language packs as foreign installations. r=frg a=frg DONTBUILD CLOSED TREE SEAMONKEY_2_49_ESR_RELBRANCH
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 15 Jul 2019 18:07:58 +0200
branchSEAMONKEY_2_49_ESR_RELBRANCH
changeset 357560 cf09bc568b9a54e2d9286b976f2fe7f24a51b776
parent 357559 a7d832fb13d102d77690756bf5e26b046ffacf78
child 357561 0d3a6f30d6b714a80a906b819ad6b73f8a40c53f
push id7836
push userfrgrahl@gmx.net
push dateMon, 15 Jul 2019 16:17:02 +0000
treeherdermozilla-esr52@3a4afe7ecac5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1512882
milestone52.9.1
Bug 1512882 - Fix detection of cZ language packs as foreign installations. r=frg a=frg DONTBUILD CLOSED TREE SeaMonkey ESR52 release branch only.
toolkit/mozapps/extensions/internal/XPIProviderUtils.js
--- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
+++ b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
@@ -1719,22 +1719,27 @@ this.XPIDatabaseReconcile = {
       applyBlocklistChanges(aNewAddon, aNewAddon, aOldAppVersion,
                             aOldPlatformVersion);
     }
 
     // The default theme is never a foreign install
     if (aNewAddon.type == "theme" && aNewAddon.internalName == XPIProvider.defaultSkin)
       aNewAddon.foreignInstall = false;
 
+    // Chatzilla language packs should not be treated as a foreign install.
+    if (aNewAddon.type == "locale" && aNewAddon.internalName == "langpack_cZ")
+      aNewAddon.foreignInstall = false;
+
     if (isDetectedInstall && aNewAddon.foreignInstall) {
       // If the add-on is a foreign install and is in a scope where add-ons
       // that were dropped in should default to disabled then disable it
       let disablingScopes = Preferences.get(PREF_EM_AUTO_DISABLED_SCOPES, 0);
       if (aInstallLocation.scope & disablingScopes) {
-        logger.warn("Disabling foreign installed add-on " + aNewAddon.id + " in "
+        logger.warn("Disabling foreign installed " + aNewAddon.type + " add-on "
+            + aNewAddon.id + " (" + aNewAddon.internalName + ") in "
             + aInstallLocation.name);
         aNewAddon.userDisabled = true;
 
         // If we don't have an old app version then this is a new profile in
         // which case just mark any sideloaded add-ons as already seen.
         aNewAddon.seen = !aOldAppVersion;
       }
     }