From 499d4e30652a60d998b24eaad28994daaa6914fb Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 27 Mar 2017 02:02:11 -0400 Subject: [PATCH] Handle missing deleted.txt in unpacked source directory Unpacked directories aren't actually supported anymore, but fix obvious breakage if they were. --- 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 index 5fd39e6e7..26857fa00 100644 --- 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 {