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

Bug 27604: Fix addon issues when moving TB directory

parent 81d4dc11
...@@ -485,7 +485,7 @@ class XPIState { ...@@ -485,7 +485,7 @@ class XPIState {
// Builds prior to be 1512436 did not include the rootURI property. // Builds prior to be 1512436 did not include the rootURI property.
// If we're updating from such a build, add that property now. // 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; this.rootURI = getURIForResourceInFile(this.file, "").spec;
} }
...@@ -498,7 +498,10 @@ class XPIState { ...@@ -498,7 +498,10 @@ class XPIState {
saved.currentModifiedTime != this.lastModifiedTime saved.currentModifiedTime != this.lastModifiedTime
) { ) {
this.lastModifiedTime = saved.currentModifiedTime; this.lastModifiedTime = saved.currentModifiedTime;
} else if (saved.currentModifiedTime === null) { } else if (
saved.currentModifiedTime === null &&
(!this.file || !this.file.exists())
) {
this.missing = true; this.missing = true;
} }
} }
...@@ -1439,6 +1442,7 @@ var XPIStates = { ...@@ -1439,6 +1442,7 @@ var XPIStates = {
if (oldState[loc.name]) { if (oldState[loc.name]) {
loc.restore(oldState[loc.name]); loc.restore(oldState[loc.name]);
changed = changed || loc.path != oldState[loc.name].path;
} }
changed = changed || loc.changed; changed = changed || loc.changed;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment