mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

23
chrome/content/zotero/xpcom/dataDirectory.js
View file

@ -840,14 +840,21 @@ Zotero.DataDirectory = {
}
// Skip migration if new dir on different drive and prompt
if (yield this.isNewDirOnDifferentDrive(dataDir, newDir)) {
Zotero.debug(`New dataDir ${newDir} is on a different drive from ${dataDir} -- skipping migration`);
Zotero.DataDirectory.newDirOnDifferentDrive = true;
let error = Zotero.getString(`dataDir.migration.failure.full.automatic.newDirOnDifferentDrive`, Zotero.clientName)
+ "\n\n"
+ Zotero.getString(`dataDir.migration.failure.full.automatic.text2`, Zotero.appName);
return this.fullMigrationFailurePrompt(dataDir, newDir, error);
try {
if (yield this.isNewDirOnDifferentDrive(dataDir, newDir)) {
Zotero.debug(`New dataDir ${newDir} is on a different drive from ${dataDir} -- skipping migration`);
Zotero.DataDirectory.newDirOnDifferentDrive = true;
let error = Zotero.getString(`dataDir.migration.failure.full.automatic.newDirOnDifferentDrive`, Zotero.clientName)
+ "\n\n"
+ Zotero.getString(`dataDir.migration.failure.full.automatic.text2`, Zotero.appName);
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