diff options
| -rw-r--r-- | lib/private/Updater.php | 8 | ||||
| -rw-r--r-- | version.php | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 02b3138f30f..4098d1b767d 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 13501453cc6..93a2001444e 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'; |