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

Skip migration on error checking whether dataDir is on different drive

Browse Source
This commit is contained in:
Dan Stillman 2017-11-20 11:38:15 -05:00
parent f546fbda99
commit f0b7a212e5
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chrome/content/zotero/xpcom/dataDirectory.js
View File

@ -840,6 +840,7 @@ Zotero.DataDirectory = {
} }
// Skip migration if new dir on different drive and prompt // Skip migration if new dir on different drive and prompt
try {
if (yield this.isNewDirOnDifferentDrive(dataDir, newDir)) { if (yield this.isNewDirOnDifferentDrive(dataDir, newDir)) {
Zotero.debug(`New dataDir ${newDir} is on a different drive from ${dataDir} -- skipping migration`); Zotero.debug(`New dataDir ${newDir} is on a different drive from ${dataDir} -- skipping migration`);
Zotero.DataDirectory.newDirOnDifferentDrive = true; Zotero.DataDirectory.newDirOnDifferentDrive = true;
@ -849,6 +850,12 @@ Zotero.DataDirectory = {
+ Zotero.getString(`dataDir.migration.failure.full.automatic.text2`, Zotero.appName); + Zotero.getString(`dataDir.migration.failure.full.automatic.text2`, Zotero.appName);
return this.fullMigrationFailurePrompt(dataDir, newDir, error); return this.fullMigrationFailurePrompt(dataDir, newDir, error);
} }
}
catch (e) {
Zotero.logError("Error checking whether data directory is on different drive "
+ "-- skipping migration:\n\n" + e);
return false;
}
// Check for an existing pipe from other running versions of Zotero pointing at the same data // Check for an existing pipe from other running versions of Zotero pointing at the same data
// directory, and skip migration if found // directory, and skip migration if found