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.

Sign up for GitHub

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

Make sure to do priority app upgrades first #25034

Merged
merged 1 commit into from
Jan 11, 2021
Merged

Make sure to do priority app upgrades first #25034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ private function doUpgrade($currentVersion, $installedVersion) {
$this->upgradeAppStoreApps($autoDisabledApps, true);

// install new shipped apps on upgrade
OC_App::loadApps(['authentication']);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are in maintenance mode here already, so this never worked due to

server/lib/private/legacy/OC_App.php

Lines 116 to 117 in d89a75b

if ((bool) \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
return false;

$errors = Installer::installShippedApps(true);
foreach ($errors as $appId => $exception) {
/** @var \Exception $exception */
Expand Down Expand Up @@ -332,7 +331,8 @@ protected function doAppUpgrade() {
$stacks[$pseudoOtherType][] = $appId;
}
}
foreach ($stacks as $type => $stack) {
foreach (array_merge($priorityTypes, [$pseudoOtherType]) as $type) {
$stack = $stacks[$type];
foreach ($stack as $appId) {
if (\OC_App::shouldUpgrade($appId)) {
$this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]);
Expand Down