Bug 592785 - Don't report add-ons as incompatible if they are already incompatible with the current version. r=dtownsend, a=approval2.0 dtownsend
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 01 Sep 2010 16:26:30 -0700
changeset 51860 1d82f70c523926e53680a5e4ff8505059cea9e5b
parent 51859 ed6440d2f0c9cc55e122e1592a21be34405eaceb
child 51861 4e295e38281d8d82856b72c3c202b0a7de5aed21
push id15454
push userrstrong@mozilla.com
push dateWed, 01 Sep 2010 23:27:33 +0000
treeherdermozilla-central@3c3c95c37d20 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdtownsend, approval2
bugs592785
milestone2.0b6pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 592785 - Don't report add-ons as incompatible if they are already incompatible with the current version. r=dtownsend, a=approval2.0 dtownsend
toolkit/mozapps/update/content/updates.js
toolkit/mozapps/update/nsUpdateService.js
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -519,16 +519,17 @@ var gUpdates = {
         // then the user should be warned that the add-on will become
         // incompatible. If an addon's type equals plugin it is skipped since
         // checking plugins compatibility information isn't supported and
         // getting the scope property of a plugin breaks in some environments
         // (see bug 566787).
         if (addon.type != "plugin" &&
             !addon.appDisabled && !addon.userDisabled &&
             addon.scope != AddonManager.SCOPE_APPLICATION &&
+            addon.isCompatible &&
             !addon.isCompatibleWith(self.update.appVersion,
                                     self.update.platformVersion))
           self.addons.push(addon);
       });
 
       aCallback(self.addons.length != 0);
     });
   },
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -1451,16 +1451,17 @@ UpdateService.prototype = {
         // then the user should be warned that the add-on will become
         // incompatible. If an addon's type equals plugin it is skipped since
         // checking plugins compatibility information isn't supported and
         // getting the scope property of a plugin breaks in some environments
         // (see bug 566787).
         if (addon.type != "plugin" &&
             !addon.appDisabled && !addon.userDisabled &&
             addon.scope != AddonManager.SCOPE_APPLICATION &&
+            addon.isCompatible &&
             !addon.isCompatibleWith(self._update.appVersion,
                                     self._update.platformVersion))
           self._incompatibleAddons.push(addon);
       });
 
       if (self._incompatibleAddons.length > 0) {
       /**
 #        PREF_APP_UPDATE_INCOMPATIBLE_MODE