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

migrate: only pass the old data dir

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-09-10 15:15:20 -07:00
parent 78c8f1de71
commit 2691d46d50
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apptask.js
+5 -5
View File
@@ -692,13 +692,13 @@ function changeLocation(app, oldConfig, progressCallback, callback) {
});
}
function migrateDataDir(app, oldConfig, progressCallback, callback) {
function migrateDataDir(app, oldDataDir, progressCallback, callback) {
assert.strictEqual(typeof app, 'object');
assert.strictEqual(typeof oldConfig, 'object');
assert.strictEqual(typeof oldDataDir, 'string');
assert.strictEqual(typeof progressCallback, 'function');
assert.strictEqual(typeof callback, 'function');
const dataDirChanged = oldConfig.dataDir !== app.dataDir;
const dataDirChanged = oldDataDir !== app.dataDir;
async.series([
progressCallback.bind(null, { percent: 10, message: 'Cleaning up old install' }),
@@ -716,7 +716,7 @@ function migrateDataDir(app, oldConfig, progressCallback, callback) {
function (next) {
if (!dataDirChanged) return next();
moveDataDir(app, oldConfig.dataDir, next);
moveDataDir(app, oldDataDir, next);
},
progressCallback.bind(null, { percent: 60, message: 'Creating container' }),
@@ -1028,7 +1028,7 @@ function run(appId, args, progressCallback, callback) {
case apps.ISTATE_PENDING_DEBUG:
return create(app, progressCallback, callback);
case apps.ISTATE_PENDING_LOCATION_CHANGE: return changeLocation(app, args.oldConfig, progressCallback, callback);
case apps.ISTATE_PENDING_DATA_DIR_MIGRATION: return migrateDataDir(app, args.oldConfig, progressCallback, callback);
case apps.ISTATE_PENDING_DATA_DIR_MIGRATION: return migrateDataDir(app, args.oldDataDir, progressCallback, callback);
case apps.ISTATE_PENDING_UNINSTALL: return uninstall(app, progressCallback, callback);
case apps.ISTATE_PENDING_CLONE: return install(app, args.restoreConfig || {}, progressCallback, callback);
case apps.ISTATE_PENDING_RESTORE: return install(app, args.restoreConfig || {}, progressCallback, callback);