diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-03-21 18:31:59 +0300 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-03-21 18:31:59 +0300 |
| commit | 444343dc2bc0b5e214d09e8edef685387475b705 (patch) | |
| tree | d5ec18e098030c167c3c401caff5e93dd94c920d /lib/private/updater.php | |
| parent | 86581f66265be0dddb97f67ac867a5cb92d335e0 (diff) | |
Do not abort with an exception when a default app can not be enabled
Diffstat (limited to 'lib/private/updater.php')
| -rw-r--r-- | lib/private/updater.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php index 4f74481562b..0d567b8dfb9 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -333,7 +333,12 @@ class Updater extends BasicEmitter { // install new shipped apps on upgrade OC_App::loadApps('authentication'); - OC_Installer::installShippedApps(); + $errors = OC_Installer::installShippedApps(true); + foreach ($errors as $appId => $exception) { + /** @var \Exception $exception */ + $this->log->logException($exception, ['app' => $appId]); + $this->emit('\OC\Updater', 'failure', [$appId . ': ' . $exception->getMessage()]); + } // post-upgrade repairs $repair = new Repair(Repair::getRepairSteps()); |