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

short-circuit updates from prerelease to release version

Browse Source 
Fixes #575
This commit is contained in:
girish@cloudron.io
2016-01-25 14:48:09 -08:00
parent 5254d3325f
commit ac3681296e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cloudron.js
View File

@@ -514,7 +514,12 @@ function update(boxUpdateInfo, callback) {
progress.set(progress.UPDATE, 0, 'Starting');
// initiate the update/upgrade but do not wait for it
if (boxUpdateInfo.upgrade) {
if (config.version().match(/[-+]/) !== null && (config.version() === boxUpdateInfo.version.replace(/[-+].*/, ''))) {
debug('Starting short-circuit from prerelease version %s to release version %s', config.version(), boxUpdateInfo.version);
config.setVersion(boxUpdateInfo.version);
progress.set(progress.UPDATE, 100, '');
locker.unlock(locker.OP_BOX_UPDATE);
} else if (boxUpdateInfo.upgrade) {
debug('Starting upgrade');
doUpgrade(boxUpdateInfo, function (error) {
if (error) {