mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Morris Jobke 2018-06-26 16:35:38 +02:00
parent a1a29d14c8
commit 8b1084adfe
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Updater.php
View File

@ -111,10 +111,14 @@ class Updater extends BasicEmitter {
$this->emit('\OC\Updater', 'maintenanceEnabled'); $this->emit('\OC\Updater', 'maintenanceEnabled');
} }
$this->waitForCronToFinish();
$installedVersion = $this->config->getSystemValue('version', '0.0.0'); $installedVersion = $this->config->getSystemValue('version', '0.0.0');
$currentVersion = implode('.', \OCP\Util::getVersion()); $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')); $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
$success = true; $success = true;

2
version.php
View File

@ -29,7 +29,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number. // when updating major/minor version number.
$OC_Version = array(14, 0, 0, 8); $OC_Version = array(14, 0, 0, 9);
// The human readable string // The human readable string
$OC_VersionString = '14.0.0 alpha'; $OC_VersionString = '14.0.0 alpha';