wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24787 from owncloud/fix-update-issue-on-master

Browse source 
Add the background jobs after the table was updated
This commit is contained in:
Vincent Petry 2016-05-24 10:14:00 +02:00
commit ee1f4602f3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/Updater.php
View file

@ -217,8 +217,6 @@ class Updater extends BasicEmitter {
try { try {
Setup::updateHtaccess(); Setup::updateHtaccess();
Setup::protectDataDirectory(); Setup::protectDataDirectory();
// TODO: replace with the new repair step mechanism https://github.com/owncloud/core/pull/24378
Setup::installBackgroundJobs();
} catch (\Exception $e) { } catch (\Exception $e) {
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
} }
@ -244,6 +242,13 @@ class Updater extends BasicEmitter {
if ($this->updateStepEnabled) { if ($this->updateStepEnabled) {
$this->doCoreUpgrade(); $this->doCoreUpgrade();
try {
// TODO: replace with the new repair step mechanism https://github.com/owncloud/core/pull/24378
Setup::installBackgroundJobs();
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
}
// update all shipped apps // update all shipped apps
$disabledApps = $this->checkAppsRequirements(); $disabledApps = $this->checkAppsRequirements();
$this->doAppUpgrade(); $this->doAppUpgrade();