Browse Source

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>
tags/v14.0.0beta1
Morris Jobke 6 years ago
parent
commit
8b1084adfe
No account linked to committer's email address
2 changed files with 7 additions and 3 deletions
  1. 6
    2
      lib/private/Updater.php
  2. 1
    1
      version.php

+ 6
- 2
lib/private/Updater.php View File

@@ -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;

+ 1
- 1
version.php View File

@@ -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';

Loading…
Cancel
Save