From 8b1084adfe6de26d8b0c28df18756640ed0d4093 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 26 Jun 2018 16:35:38 +0200 Subject: [PATCH] Only wait for cron if fix for endless wait is included * see https://github.com/nextcloud/server/issues/9992 Signed-off-by: Morris Jobke --- lib/private/Updater.php | 8 ++++++-- version.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 02b3138f30..4098d1b767 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -111,10 +111,14 @@ class Updater extends BasicEmitter { $this->emit('\OC\Updater', 'maintenanceEnabled'); } - $this->waitForCronToFinish(); - $installedVersion = $this->config->getSystemValue('version', '0.0.0'); $currentVersion = implode('.', \OCP\Util::getVersion()); + + // see https://github.com/nextcloud/server/issues/9992 for potential problem + if (version_compare($installedVersion, '14.0.0.9', '>=')) { + $this->waitForCronToFinish(); + } + $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core')); $success = true; diff --git a/version.php b/version.php index 13501453cc..93a2001444 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(14, 0, 0, 8); +$OC_Version = array(14, 0, 0, 9); // The human readable string $OC_VersionString = '14.0.0 alpha';