tor-browser

commit 81b7230d0a47ec6dbf4bf7432dfbef87098f1c06
parent 8ce23df3d474357346226be518dd9f2fd6e35796
Author: Alex Catarineu <acat@torproject.org>
Date:   Wed, 30 Oct 2019 10:44:48 +0100

BB 27604: Fix addon issues when moving the profile directory

Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838

Diffstat:
M
toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
@@ -499,7 +499,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;
     }
 
@@ -512,7 +512,10 @@ class XPIState {
       saved.currentModifiedTime != this.lastModifiedTime
     ) {
       this.lastModifiedTime = saved.currentModifiedTime;
-    } else if (saved.currentModifiedTime === null) {
+    } else if (
+      saved.currentModifiedTime === null &&
+      (!this.file || !this.file.exists())
+    ) {
       this.missing = true;
     }
   }
@@ -1620,6 +1623,7 @@ var XPIStates = {
 
       if (shouldRestoreLocationData && oldState[loc.name]) {
         loc.restore(oldState[loc.name]);
+        changed = changed || loc.path != oldState[loc.name].path;
       }
       changed = changed || loc.changed;