suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display more helpful message on upgrade errors due to open files

Browse Source
This commit is contained in:
Dan Stillman 2009-07-26 09:23:59 +00:00
parent 14c1e9d15e
commit 147cd45f07
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chrome/content/zotero/xpcom/schema.js
View File

@ -57,6 +57,11 @@ Zotero.Schema = new function(){
"zotero-schema-upgrade", "chrome,centerscreen,modal", io); "zotero-schema-upgrade", "chrome,centerscreen,modal", io);
if (obj.data.e) { if (obj.data.e) {
if (obj.data.e.name && obj.data.e.name == "NS_ERROR_FAILURE" && obj.data.e.message.match(/nsIFile\.moveTo/)) {
Components.utils.reportError(obj.data.e);
return false;
}
var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(Components.interfaces.nsIWindowWatcher); .getService(Components.interfaces.nsIWindowWatcher);
var data = { var data = {
@ -2396,6 +2401,21 @@ Zotero.Schema = new function(){
} }
} }
Zotero.DB.rollbackTransaction(); Zotero.DB.rollbackTransaction();
// Display more helpful message on errors due to open files
//
// Conditional should be same as in showUpgradeWizard()
if (e.name && e.name == "NS_ERROR_FAILURE" && e.message.match(/nsIFile\.moveTo/)) {
// TODO: localize
var pr = Components.classes["@mozilla.org/network/default-prompt;1"]
.getService(Components.interfaces.nsIPrompt);
var title = "Upgrade Failed";
var couldNotMigrate = "Zotero could not migrate all necessary files.";
var closeAttachmentFiles = "Please close any open attachment files and restart Firefox to try the upgrade again.";
var restartYourComputer = "If you continue to receive this message, restart your computer.";
pr.alert(title, Zotero.localeJoin([couldNotMigrate, closeAttachmentFiles]) + "\n\n" + restartYourComputer);
}
throw(e); throw(e);
} }