Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

juliusknorr
Copy link
Member

@juliusknorr juliusknorr commented Aug 16, 2024

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

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

susnux commented Aug 16, 2024

/backport to stable30

@juliusknorr juliusknorr requested review from a team, Altahrim and sorbaugh and removed request for Altahrim and a team August 29, 2024 13:45
@juliusknorr juliusknorr force-pushed the fix/appstore-upgrade-failure branch from 9f532b0 to 5c9d32b Compare August 30, 2024 09:05
@skjnldsv skjnldsv 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 enabled auto-merge September 4, 2024 07:17
@skjnldsv skjnldsv disabled auto-merge September 4, 2024 07:29
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@skjnldsv skjnldsv force-pushed the fix/appstore-upgrade-failure branch from 1281f44 to 3ca7480 Compare September 4, 2024 07:31
@skjnldsv skjnldsv merged commit e11a8f0 into master Sep 4, 2024
25 checks passed
@skjnldsv skjnldsv deleted the fix/appstore-upgrade-failure branch September 4, 2024 07:31
@skjnldsv skjnldsv mentioned this pull request Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants