Skip to content

fix: Do not throw if appstore is unavailable during upgrade - #47285

Merged
skjnldsv merged 1 commit into
masterfrom
fix/appstore-upgrade-failure
Sep 4, 2024
Merged

fix: Do not throw if appstore is unavailable during upgrade#47285
skjnldsv merged 1 commit into
masterfrom
fix/appstore-upgrade-failure

Conversation

@juliusknorr

@juliusknorrjuliusknorr commented Aug 16, 2024

Copy link
Copy Markdown
Member

Instead of throwing an error we just return an empty list as it is also done if there was a previous error a few lines above and instead just log it.

Otherwise this may leave apps disabled that used to be enabled before:

if (!empty($previousEnableStates)) {
$ocApp = new \OC_App();
if (!empty($previousEnableStates[$app]) && is_array($previousEnableStates[$app])) {
$ocApp->enable($app, $previousEnableStates[$app]);
} else {
$ocApp->enable($app);
}
}

Checklist

@juliusknorrjuliusknorr added bug 3. to review Waiting for reviews labels Aug 16, 2024
@juliusknorrjuliusknorr added this to the Nextcloud 31 milestone Aug 16, 2024
@juliusknorr
juliusknorr requested review from a team, Altahrim, ArtificialOwl and yemkareems and removed request for a teamAugust 16, 2024 16:23
@susnux

Copy link
Copy Markdown
Contributor

/backport to stable30

@juliusknorr
juliusknorr requested review from a team, Altahrim and sorbaugh and removed request for a team and AltahrimAugust 29, 2024 13:45
@juliusknorr
juliusknorrforce-pushed the fix/appstore-upgrade-failure branch from 9f532b0 to 5c9d32bCompareAugust 30, 2024 09:05
@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 4, 2024
@skjnldsv
skjnldsv disabled auto-merge September 4, 2024 07:29
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@skjnldsv
skjnldsvforce-pushed the fix/appstore-upgrade-failure branch from 1281f44 to 3ca7480CompareSeptember 4, 2024 07:31
@skjnldsv
skjnldsv merged commit e11a8f0 into masterSep 4, 2024
@skjnldsv
skjnldsv deleted the fix/appstore-upgrade-failure branch September 4, 2024 07:31
@skjnldsvskjnldsv mentioned this pull request Jan 7, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@juliusknorr@susnux@skjnldsv@sorbaugh