Commit a6425b9a authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by brizental
Browse files

fixup! BB 27604: Fix addon issues when moving the profile directory

BB 44795: Revert 27604, as upstream resolved their related Bug.

Revert "BB 27604: Fix addon issues when moving the profile directory"

This reverts commit 419a66bb.
parent 7206e6d7
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -508,9 +508,7 @@ class XPIState {
    // by XPIDatabaseReconcile.updatePath (called from XPIDatabaseReconcile.updateExistingAddon
    // when the oldAddon.path and newAddon.path are mismatching, as part of the
    // XPIDatabaseReconcile.processFileChanges logic).
    //
    // On Tor Browser we do it anyway whenever this.file is defined (tor-browser#27604)
    if (this.file) {
    if (this.file && (isRelocatedLocation || !("rootURI" in this))) {
      this.rootURI = getURIForResourceInFile(this.file, "").spec;
      if (isRelocatedLocation) {
        logger.warn(
@@ -528,10 +526,7 @@ class XPIState {
      saved.currentModifiedTime != this.lastModifiedTime
    ) {
      this.lastModifiedTime = saved.currentModifiedTime;
    } else if (
      saved.currentModifiedTime === null &&
      (!this.file || !this.file.exists())
    ) {
    } else if (saved.currentModifiedTime === null) {
      this.missing = true;
    }
  }
@@ -1657,7 +1652,6 @@ var XPIStates = {

      if (shouldRestoreLocationData && oldState[loc.name]) {
        loc.restore(oldState[loc.name]);
        changed = changed || loc.path != oldState[loc.name].path;
      }
      changed = changed || loc.changed;