From fa842034edfc0b8ba65a2c339a9b28112471945f Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 28 Dec 2023 12:15:11 +0100 Subject: [PATCH] update: continue to update apps if box update never starts https://forum.cloudron.io/topic/10699/no-automatic-app-updates-with-pending-box-update --- CHANGES | 2 +- src/cron.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index da3f5f248..4dc0f70eb 100644 --- a/CHANGES +++ b/CHANGES @@ -2723,4 +2723,4 @@ [7.6.3] * postgres: do not clear search_path for restore * route53: retry on rate limit errors - +* update: continue with app update if box update does not start diff --git a/src/cron.js b/src/cron.js index e45a27bbd..b78ac700c 100644 --- a/src/cron.js +++ b/src/cron.js @@ -219,8 +219,9 @@ async function handleAutoupdatePatternChanged(pattern) { if (updateInfo.box && !updateInfo.box.unstable) { debug('Starting box autoupdate to %j', updateInfo.box); const [error] = await safe(updater.updateToLatest({ skipBackup: false }, AuditSource.CRON)); - if (error) debug(`Failed to box autoupdate: ${error.message}`); - return; + if (!error) return; // do not start app updates when a box update got scheduled + debug(`Failed to start box autoupdate task: ${error.message}`); + // fall through to update apps if box update never started (failed ubuntu or avx check) } const appUpdateInfo = _.omit(updateInfo, 'box');