From a915348b22005bf993c8ef799fae76b06a695676 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 17 Jan 2019 10:58:34 -0800 Subject: [PATCH] Return correct error code when already locked --- src/backups.js | 2 +- src/updater.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backups.js b/src/backups.js index cc57bf123..acb0c87b0 100644 --- a/src/backups.js +++ b/src/backups.js @@ -994,7 +994,7 @@ function backupBoxAndApps(progressCallback, callback) { function startBackupTask(auditSource, callback) { let error = locker.lock(locker.OP_FULL_BACKUP); - if (error) return callback(error); + if (error) return callback(new BackupsError(BackupsError.BAD_STATE, `Cannot backup now: ${error.message}`)); let task = tasks.startTask(tasks.TASK_BACKUP, []); task.on('error', (error) => callback(new BackupsError(BackupsError.INTERNAL_ERROR, error))); diff --git a/src/updater.js b/src/updater.js index 82a0fe01f..9ca296a25 100644 --- a/src/updater.js +++ b/src/updater.js @@ -190,7 +190,7 @@ function updateToLatest(auditSource, callback) { if (!boxUpdateInfo.sourceTarballUrl) return callback(new UpdaterError(UpdaterError.BAD_STATE, 'No automatic update available')); let error = locker.lock(locker.OP_BOX_UPDATE); - if (error) return callback(error); + if (error) return callback(new UpdaterError(UpdaterError.BAD_STATE, `Cannot update now: ${error.message}`)); let task = tasks.startTask(tasks.TASK_UPDATE, [ boxUpdateInfo ]); task.on('error', (error) => callback(new UpdaterError(UpdaterError.INTERNAL_ERROR, error)));