diff --git a/src/backupformat/rsync.js b/src/backupformat/rsync.js index 0173ce75f..939293dd2 100644 --- a/src/backupformat/rsync.js +++ b/src/backupformat/rsync.js @@ -216,11 +216,11 @@ async function download(backupConfig, remotePath, dataLayout, progressCallback) assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout'); assert.strictEqual(typeof progressCallback, 'function'); - debug(`download: Downloading ${remotePath} to ${dataLayout.toString()}`); - const backupFilePath = getBackupFilePath(backupConfig, remotePath); const downloadDirAsync = util.promisify(downloadDir); + debug(`download: Downloading ${backupFilePath} to ${dataLayout.toString()}`); + await downloadDirAsync(backupConfig, backupFilePath, dataLayout, progressCallback); await restoreFsMetadata(dataLayout, `${dataLayout.localRoot()}/fsmetadata.json`); } diff --git a/src/backupformat/tgz.js b/src/backupformat/tgz.js index f085fb326..ab6785e8e 100644 --- a/src/backupformat/tgz.js +++ b/src/backupformat/tgz.js @@ -145,7 +145,7 @@ async function download(backupConfig, remotePath, dataLayout, progressCallback) const backupFilePath = getBackupFilePath(backupConfig, remotePath); await promiseRetry({ times: 5, interval: 20000, debug }, async () => { - progressCallback({ message: `Downloading backup ${remotePath}` }); + progressCallback({ message: `Downloading backup ${backupFilePath}` }); const sourceStream = await storage.api(backupConfig.provider).download(backupConfig, backupFilePath); const ps = tarExtract(sourceStream, dataLayout, backupConfig.encryption);