[tor-commits] [tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.

[gk at torproject.org]

commit a2463b202cf29917b97b02eaaf38c4c6df9e887b
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Wed Jul 22 14:28:58 2020 -0400

    fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
---
 browser/base/content/aboutDialog-appUpdater-legacy.js | 2 +-
 browser/components/BrowserContentHandler.jsm          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/aboutDialog-appUpdater-legacy.js b/browser/base/content/aboutDialog-appUpdater-legacy.js
index 0629e8eaf41a..9f96e2263295 100644
--- a/browser/base/content/aboutDialog-appUpdater-legacy.js
+++ b/browser/base/content/aboutDialog-appUpdater-legacy.js
@@ -192,7 +192,7 @@ appUpdater.prototype = {
       if (aChildID == "downloadAndInstall") {
         let updateVersion = gAppUpdater.update.displayVersion;
         // Include the build ID if this is an "a#" (nightly or aurora) build
-        if (/a\d+$/.test(updateVersion)) {
+        if (!AppConstants.TOR_BROWSER_UPDATE && /a\d+$/.test(updateVersion)) {
           let buildID = gAppUpdater.update.buildID;
           let year = buildID.slice(0, 4);
           let month = buildID.slice(4, 6);
diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm
index 6888369473e4..1cc1015414fc 100644
--- a/browser/components/BrowserContentHandler.jsm
+++ b/browser/components/BrowserContentHandler.jsm
@@ -734,9 +734,10 @@ nsBrowserContentHandler.prototype = {
               "startup.homepage_override_url"
             );
             let update = UpdateManager.activeUpdate;
+            let old_version = old_tbversion ? old_tbversion: old_mstone;
             if (
               update &&
-              Services.vc.compare(update.appVersion, old_mstone) > 0
+              Services.vc.compare(update.appVersion, old_version) > 0
             ) {
               overridePage = getPostUpdateOverridePage(update, overridePage);
               // Send the update ping to signal that the update was successful.