jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix usage of tar.gz API

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-04-30 17:42:55 -07:00
parent e5c42f2b90
commit 7a3d3a3c74
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/filesystem.js
View File

@@ -68,7 +68,7 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
callback(null);
});
targz.create(sourceDirectories, apiConfig.key || '', fileStream, callback);
targz.create(sourceDirectories, apiConfig.key || null, fileStream, callback);
});
}
@@ -80,8 +80,7 @@ function restore(apiConfig, backupId, destination, callback) {
callback = once(callback);
var isOldFormat = backupId.endsWith('.tar.gz');
var sourceFilePath = isOldFormat ? path.join(apiConfig.backupFolder || FALLBACK_BACKUP_FOLDER, backupId) : getBackupFilePath(apiConfig, backupId);
var sourceFilePath = getBackupFilePath(apiConfig, backupId);
debug('[%s] restore: %s -> %s', backupId, sourceFilePath, destination);
@@ -94,7 +93,7 @@ function restore(apiConfig, backupId, destination, callback) {
callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
});
targz.extract(fileStream, isOldFormat, destination, apiConfig.key || '', callback);
targz.extract(fileStream, destination, apiConfig.key || null, callback);
}
function copyBackup(apiConfig, oldBackupId, newBackupId, callback) {