Browse Source

Make sure to do priority app upgrades first

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 <jus@bitgrid.net>
tags/v21.0.0beta6
Julius Härtl 3 years ago
parent
commit
f31edf1544
No account linked to committer's email address
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      lib/private/Updater.php

+ 2
- 2
lib/private/Updater.php View File

@@ -267,7 +267,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 */
@@ -332,7 +331,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)]);

Loading…
Cancel
Save