Bug 1096787 - copy new logins.json database when using fx reset, r=MattN

--HG--
extra : rebase_source : e0d9ecd2d99c7e479869ee0066ab0521d21133f3
This commit is contained in:
Gijs Kruitbosch 2014-11-12 00:35:02 +00:00
parent b080e4cc19
commit cac75a55f3

View File

@ -75,9 +75,11 @@ FirefoxProfileMigrator.prototype._getResourcesInternal = function(sourceProfileD
let files = [];
for (let fileName of aFileNames) {
let file = this._getFileObject(sourceProfileDir, fileName);
if (!file)
return null;
files.push(file);
if (file)
files.push(file);
}
if (!files.length) {
return null;
}
return {
type: aMigrationType,
@ -94,7 +96,7 @@ FirefoxProfileMigrator.prototype._getResourcesInternal = function(sourceProfileD
let places = getFileResource(types.HISTORY, ["places.sqlite"]);
let cookies = getFileResource(types.COOKIES, ["cookies.sqlite"]);
let passwords = getFileResource(types.PASSWORDS,
["signons.sqlite", "key3.db"]);
["signons.sqlite", "logins.json", "key3.db"]);
let formData = getFileResource(types.FORMDATA, ["formhistory.sqlite"]);
let bookmarksBackups = getFileResource(types.OTHERDATA,
[PlacesBackups.profileRelativeFolderPath]);