[tor-commits] [tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 27604: Fix addon issues when moving TB directory

[gk@xxxxxxxxxxxxxx]

commit 7d5f879bba1e81ee64576e882f9d8916a2bc471e
Author: Alex Catarineu <acat@xxxxxxxxxxxxxx>
Date:   Wed Oct 30 10:44:48 2019 +0100

    Bug 27604: Fix addon issues when moving TB directory
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 4f2155a9fbce..b29a118f912a 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -485,7 +485,7 @@ class XPIState {
 
     // Builds prior to be 1512436 did not include the rootURI property.
     // If we're updating from such a build, add that property now.
-    if (!("rootURI" in this) && this.file) {
+    if (this.file) {
       this.rootURI = getURIForResourceInFile(this.file, "").spec;
     }
 
@@ -499,7 +499,10 @@ class XPIState {
     ) {
       this.lastModifiedTime = saved.currentModifiedTime;
       this.changed = true;
-    } else if (saved.currentModifiedTime === null) {
+    } else if (
+      saved.currentModifiedTime === null &&
+      (!this.file || !this.file.exists())
+    ) {
       this.missing = true;
       this.changed = true;
     }
@@ -1444,6 +1447,7 @@ var XPIStates = {
 
       if (oldState[loc.name]) {
         loc.restore(oldState[loc.name]);
+        changed = changed || loc.path != oldState[loc.name].path;
       }
       changed = changed || loc.changed;
 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits