Wait for cron to finish before running upgrade command

* fixes #9562

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

1 files changed, 5 insertions, 1 deletions

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 6ec6b71731d..c1210eaa5b7 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -119,7 +119,8 @@ if (\OCP\Util::needUpgrade()) {
 			$config,
 			\OC::$server->getIntegrityCodeChecker(),
 			$logger,
-			\OC::$server->query(\OC\Installer::class)
+			\OC::$server->query(\OC\Installer::class),
+			\OC::$server->getJobList()
 	);
 	$incompatibleApps = [];
 
@@ -152,6 +153,9 @@ if (\OCP\Util::needUpgrade()) {
 	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
 	});
+	$updater->listen('\OC\Updater', 'waitForCronToFinish', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Waiting for cron to finish (checks again in 5 seconds)...'));
+	});
 	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Updating database schema'));
 	});