From b4b999bd741eed9f84ccb838b36852789832a491 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Tue, 5 Apr 2022 13:11:30 +0200 Subject: [PATCH] Fix await safe usage --- src/backuptask.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backuptask.js b/src/backuptask.js index 3af737f6b..160aea183 100644 --- a/src/backuptask.js +++ b/src/backuptask.js @@ -802,10 +802,10 @@ async function rotateBoxBackup(backupConfig, tag, options, dependsOn, progressCa }; const id = await backups.add(data); - const [copyBackupError] = await safe(copy(backupConfig, 'snapshot/box', remotePath, progressCallback)); - const state = copyBackupError ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL; + const [error] = await safe(copy(backupConfig, 'snapshot/box', remotePath, progressCallback)); + const state = error ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL; await backups.setState(id, state); - if (copyBackupError) throw copyBackupError; + if (error) throw error; return id; } @@ -851,10 +851,10 @@ async function rotateAppBackup(backupConfig, app, tag, options, progressCallback }; const id = await backups.add(data); - const copyBackupError = await safe(copy(backupConfig, `snapshot/app_${app.id}`, remotePath, progressCallback)); - const state = copyBackupError ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL; + const [error] = await safe(copy(backupConfig, `snapshot/app_${app.id}`, remotePath, progressCallback)); + const state = error ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL; await backups.setState(id, state); - if (copyBackupError) throw copyBackupError; + if (error) throw error; return id; } @@ -986,10 +986,10 @@ async function rotateMailBackup(backupConfig, tag, options, progressCallback) { }; const id = await backups.add(data); - const [copyBackupError] = await safe(copy(backupConfig, 'snapshot/mail', remotePath, progressCallback)); - const state = copyBackupError ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL; + const [error] = await safe(copy(backupConfig, 'snapshot/mail', remotePath, progressCallback)); + const state = error ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL; await backups.setState(id, state); - if (copyBackupError) throw copyBackupError; + if (error) throw error; return id; }