mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix DB backup (broken by 5a6f1eef6)

Browse source
This commit is contained in:
Dan Stillman 2016-11-27 15:40:34 -05:00
parent 0609b62a39
commit 0ad4598128
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/db.js
View file

@ -1016,7 +1016,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function
if (DB_LOCK_EXCLUSIVE) { if (DB_LOCK_EXCLUSIVE) {
yield this.queryAsync("PRAGMA locking_mode=NORMAL", false, { inBackup: true }); yield this.queryAsync("PRAGMA locking_mode=NORMAL", false, { inBackup: true });
} }
storageService.backupDatabaseFile(file, tmpFile.leafName, file.parent); storageService.backupDatabaseFile(file, OS.Path.basename(tmpFile), file.parent);
} }
catch (e) { catch (e) {
Zotero.debug(e); Zotero.debug(e);
@ -1031,12 +1031,12 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function
// Open the backup to check for corruption // Open the backup to check for corruption
try { try {
var connection = storageService.openDatabase(tmpFile); var connection = storageService.openDatabase(Zotero.File.pathToFile(tmpFile));
} }
catch (e) { catch (e) {
this._debug("Database file '" + tmpFile.leafName + "' is corrupt -- skipping backup"); this._debug("Database file '" + OS.Path.basename(tmpFile) + "' is corrupt -- skipping backup");
if (yield OS.File.exists(tmpFile.path)) { if (yield OS.File.exists(tmpFile)) {
yield OS.File.remove(tmpFile.path); yield OS.File.remove(tmpFile);
} }
return false; return false;
} }
@ -1091,7 +1091,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function
OS.File.remove(backupFile); OS.File.remove(backupFile);
} }
yield OS.File.move(tmpFile.path, backupFile); yield OS.File.move(tmpFile, backupFile);
Zotero.debug("Backed up to " + OS.Path.basename(backupFile)); Zotero.debug("Backed up to " + OS.Path.basename(backupFile));
return true; return true;