From f17033fa1276d74075d6bc00fa8725f2999b2e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 8 Jan 2021 12:27:51 +0100 Subject: [PATCH] Make sure to do priority app upgrades first MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise those apps might not be loaded when the others app migrations are running. The previous loading of authentication apps in the upgrade step never worked as it just returns in maintenance mode Signed-off-by: Julius Härtl --- lib/private/Updater.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 3bf2cb1b6f..c1ecd3e7c0 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -266,7 +266,6 @@ class Updater extends BasicEmitter { $this->upgradeAppStoreApps($autoDisabledApps, true); // install new shipped apps on upgrade - OC_App::loadApps(['authentication']); $errors = Installer::installShippedApps(true); foreach ($errors as $appId => $exception) { /** @var \Exception $exception */ @@ -372,7 +371,8 @@ class Updater extends BasicEmitter { $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)]);