www

commit 499d4e30652a60d998b24eaad28994daaa6914fb
parent 4477e42cf953583a748a099719a5a426c8986779
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon, 27 Mar 2017 02:02:11 -0400

Handle missing deleted.txt in unpacked source directory

Unpacked directories aren't actually supported anymore, but fix obvious
breakage if they were.

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

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -585,11 +585,14 @@ Zotero.Schema = new function(){
 			var deleted = xpiZipReader.getInputStream("deleted.txt");
 		}
 		
-		deleted = yield Zotero.File.getContentsAsync(deleted);
-		deleted = deleted.match(/^([^\s]+)/gm);
-		var version = deleted.shift();
+		let deletedVersion;
+		if (deleted) {
+			deleted = yield Zotero.File.getContentsAsync(deleted);
+			deleted = deleted.match(/^([^\s]+)/gm);
+			deletedVersion = deleted.shift();
+		}
 		
-		if (!lastVersion || lastVersion < version) {
+		if (!lastVersion || lastVersion < deletedVersion) {
 			var toDelete = [];
 			let iterator = new OS.File.DirectoryIterator(destDir);
 			try {