diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-07-09 15:49:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 15:49:41 +0200 |
| commit | ed6352af0ecb7cd4faf9635e8bab9042022b5018 (patch) | |
| tree | 7bee62fcb9e2cbe294d4ba62a81dbdafb7b6575d /lib/private/Updater.php | |
| parent | 5244501f0f327c33630631ef79bdec894a308588 (diff) | |
| parent | 79801ad263f2862106204263a4fbd72cd343df82 (diff) | |
| download | nextcloud-server-ed6352af0ecb7cd4faf9635e8bab9042022b5018.tar.gz nextcloud-server-ed6352af0ecb7cd4faf9635e8bab9042022b5018.zip | |
Merge pull request #10010 from nextcloud/bugfix/9992/fix-blocking-cron-job
Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check
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; |