[tbb-commits] [tor-browser] 02/02: fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.0.1-12.0-1
in repository tor-browser.

commit ca3d3329047825b3fee04a8d0e25e3f5bcf9d1a5
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Wed Aug 17 13:28:01 2022 +0200

    fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
---
 toolkit/xre/MacRunFromDmgUtils.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/xre/MacRunFromDmgUtils.mm b/toolkit/xre/MacRunFromDmgUtils.mm
index cf84c6f5e4743..4317837a07ba0 100644
--- a/toolkit/xre/MacRunFromDmgUtils.mm
+++ b/toolkit/xre/MacRunFromDmgUtils.mm
@@ -288,7 +288,7 @@ static void StripQuarantineBit(NSString* aBundlePath) {
   LaunchTask(@"/usr/bin/xattr", arguments);
 }
 
-#ifdef MOZ_UPDATER
+#if defined(MOZ_UPDATER) && !defined(TOR_BROWSER_UPDATE)
 bool LaunchElevatedDmgInstall(NSString* aBundlePath, NSArray* aArguments) {
   NSTask* task;
   if (@available(macOS 10.13, *)) {
@@ -332,7 +332,7 @@ static bool InstallFromPath(NSString* aBundlePath, NSString* aDestPath) {
 
   bool triedElevatedInstall = false;
 
-#ifdef MOZ_UPDATER
+#if defined(MOZ_UPDATER) && !defined(TOR_BROWSER_UPDATE)
   // The installation may have been unsuccessful if the user did not have the
   // rights to write to the Applications directory. Check for this situation and
   // launch an elevated installation if necessary. Rather than creating a new,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.