From f307698ae3cec1b420a52691dce10f72cbf83e57 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 6 Feb 2009 01:27:12 +0000
Subject: [PATCH] Fix error when upgrading from a database with an older
 version of a style with a different URI

---
 chrome/content/zotero/xpcom/schema.js | 33 +++++++++++++++------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index d0515cac4..f1785ec72 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -345,26 +345,31 @@ Zotero.Schema = new function(){
 				
 				if (mode == 'translator') {
 					var fileName = Zotero.File.getValidFileName(newObj[titleField]) + fileExt
-					
-					var destFile = destDir.clone();
-					destFile.append(fileName);
-					if (destFile.exists()) {
-						var msg = "Overwriting translator with same filename '"
-							+ fileName + "'";
-						Zotero.debug(msg, 1);
-						Components.utils.reportError(msg + " in Zotero.Schema.updateBundledFiles()");
-						destFile.remove(false);
-					}
 				}
 				else if (mode == 'style') {
 					var fileName = file.leafName;
 				}
 				
-				if (!existingObj || !existingObj.hidden) {
-					file.copyTo(destDir, fileName);
+				try {
+					var destFile = destDir.clone();
+					destFile.append(fileName);
+					if (destFile.exists()) {
+						var msg = "Overwriting " + mode + " with same filename '"
+							+ fileName + "'";
+						Zotero.debug(msg, 1);
+						Components.utils.reportError(msg + " in Zotero.Schema.updateBundledFiles()");
+						destFile.remove(false);
+					}
+					
+					if (!existingObj || !existingObj.hidden) {
+						file.copyTo(destDir, fileName);
+					}
+					else {
+						file.copyTo(hiddenDir, fileName);
+					}
 				}
-				else {
-					file.copyTo(hiddenDir, fileName);
+				catch (e) {
+					Components.utils.reportError("Error copying file " + fileName + ": " + e);
 				}
 			}
 		}