diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-06-26 16:35:38 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2018-07-09 14:53:37 +0200 |
| commit | 8b1084adfe6de26d8b0c28df18756640ed0d4093 (patch) | |
| tree | 99256806c3a4b773978e0c328ba10837523bdcf0 /lib/private/Updater.php | |
| parent | a1a29d14c8cdeb3d5a5e541ec73ff3f42f11ee03 (diff) | |
| download | nextcloud-server-8b1084adfe6de26d8b0c28df18756640ed0d4093.tar.gz nextcloud-server-8b1084adfe6de26d8b0c28df18756640ed0d4093.zip | |
Only wait for cron if fix for endless wait is included
* see https://github.com/nextcloud/server/issues/9992
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/Updater.php')
| -rw-r--r-- | lib/private/Updater.php | 8 |
1 files changed, 6 insertions, 2 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; |