www

commit b0420e347a32eb09fd93ef405514ad9c4117d0b4
parent 8a5e17610c7b99fd7eacebdec7b76053b2833e5e
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 12 Feb 2010 09:34:37 +0000

Make errors updating translators and styles on upgrade non-fatal


Diffstat:
M
chrome/content/zotero/xpcom/schema.js
 | 
19
++++++++++++++++---

1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -194,7 +194,13 @@ Zotero.Schema = new function(){
 				}
 			}
 			
-			var up4 = this.updateBundledFiles();
+			try {
+				var up4 = this.updateBundledFiles();
+			}
+			catch (e) {
+				Zotero.debug(e);
+				Components.utils.reportError(e);
+			}
 			
 			if (up2 || up3 || up4) {
 				// Run a manual scraper update if upgraded and pref set
@@ -1078,8 +1084,6 @@ Zotero.Schema = new function(){
 			Zotero.DB.commitTransaction();
 			
 			self.dbInitialized = true;
-			
-			Zotero.Schema.updateBundledFiles();
 		}
 		catch(e){
 			Zotero.debug(e, 1);
@@ -1088,6 +1092,15 @@ Zotero.Schema = new function(){
 			alert('Error initializing Zotero database');
 			throw(e);
 		}
+		
+		try {
+			Zotero.Schema.updateBundledFiles();
+		}
+		catch (e) {
+			Zotero.debug(e);
+			Components.utils.reportError(e);
+			alert('Error updating Zotero translators and styles');
+		}
 	}