Skip to content

Commit

Permalink
Only wait for cron if fix for endless wait is included
Browse files Browse the repository at this point in the history
* see #9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
  • Loading branch information
MorrisJobke committed Jun 26, 2018
1 parent a27de5d commit 63dd136
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions lib/private/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,14 @@ public function upgrade() {
$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.7', '>=')) {
$this->waitForCronToFinish();
}

$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));

$success = true;
Expand Down
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -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, 6);
$OC_Version = array(14, 0, 0, 7);

// The human readable string
$OC_VersionString = '14.0.0 alpha';
Expand Down

0 comments on commit 63dd136

Please sign in to comment.