author | Mark Hammond <mhammond@skippinet.com.au> |
Fri, 05 Dec 2014 16:54:10 -0800 | |
changeset 218664 | 95925d77a314a989c535ae1960ca1ae464be2911 |
parent 218663 | ad283fac781cd1308bf61fbb406bf1d93ecf657a |
child 218665 | f7f9ddc26c2d9438a3f91399ed33adaf5b3832f6 |
push id | 52607 |
push user | cbook@mozilla.com |
push date | Mon, 08 Dec 2014 12:08:02 +0000 |
treeherder | mozilla-inbound@850d447ba305 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | adw |
bugs | 1019985 |
milestone | 37.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/services/sync/modules/FxaMigrator.jsm +++ b/services/sync/modules/FxaMigrator.jsm @@ -196,16 +196,17 @@ Migrator.prototype = { // Write the migration sentinel if necessary. yield this._setMigrationSentinelIfNecessary(); // Must be ready to perform the actual migration. this.log.info("Performing final sync migration steps"); // Do the actual migration. let startOverComplete = new Promise((resolve, reject) => { + let observe; Services.obs.addObserver(observe = () => { this.log.info("observed that startOver is complete"); Services.obs.removeObserver(observe, "weave:service:start-over:finish"); resolve(); }, "weave:service:start-over:finish", false); }); Weave.Service.startOver();