[tbb-commits] [tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

[gk at torproject.org]

commit d70009f425f9da6a74413b286ef768ba97c899cd
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Apr 25 11:34:07 2017 -0400

    fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
    
    Bug 22041: libmozsandbox.so error after upgrading to 7.0a3
    
    Fix a problem with unstaged updates on Linux and OSX where the original
    files were not restored after a partial update failed to apply due to
    changes the user made within their installation. This would leave the
    browser in a state where it had a mix of old files and new (patched)
    files, which can cause the browser to not be able to start, and
    therefore not be able to fallback to a complete update.
---
 toolkit/mozapps/update/updater/updater.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
index 988cf55..1bc4867 100644
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -1037,9 +1037,10 @@ static int backup_restore(const NS_tchar *path, const NS_tchar *relPath)
   bool isLink = false;
 #ifndef XP_WIN
   struct stat linkInfo;
-  int rv = lstat(path, &linkInfo);
-  if (!rv) {
-    LOG(("backup_restore: cannot get info for backup file: " LOG_S, relBackup));
+  int rv = lstat(backup, &linkInfo);
+  if (rv) {
+    LOG(("backup_restore: cannot get info for backup file: " LOG_S ", err: %d",
+         relBackup, errno));
     return OK;
   }
   isLink = S_ISLNK(linkInfo.st_mode);