Commit a543dad0 authored by Alex Catarineu's avatar Alex Catarineu Committed by Matthew Finkel
Browse files

Bug 27604: Fix addon issues when moving TB directory

parent 7d2e267e

toolkit/mozapps/extensions/internal/XPIProvider.jsm

+6 −2
Original line number Diff line number Diff line
@@ -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;