Commit 3dd7a117 authored by Alex Catarineu's avatar Alex Catarineu Committed by clairehurst
Browse files

BB 27604: Fix addon issues when moving the profile directory

parent 3c8a7158
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -498,7 +498,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;
    }

@@ -511,7 +511,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;
    }
  }
@@ -1616,6 +1619,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;