diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-09 14:44:30 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-09 14:44:30 +0300 |
| commit | 38143d670b25cb172042a19a3aa822c62d2d3bab (patch) | |
| tree | a00a04f49e83da6210fa02137575a690b97fd764 /lib/private/updater.php | |
| parent | a42dd117e23fe685624487587cc5da7c0cd590f5 (diff) | |
Catch exceptions during app upgrade - fixes #16240
Diffstat (limited to 'lib/private/updater.php')
| -rw-r--r-- | lib/private/updater.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php index 8aa8b0703d7..9e2e9c962f5 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -497,11 +497,15 @@ class Updater extends BasicEmitter { */ private function upgradeAppStoreApps(array $disabledApps) { foreach($disabledApps as $app) { - if (OC_Installer::isUpdateAvailable($app)) { - $ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', ''); + try { + if (OC_Installer::isUpdateAvailable($app)) { + $ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', ''); - $this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app)); - OC_Installer::updateAppByOCSId($ocsId); + $this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app)); + OC_Installer::updateAppByOCSId($ocsId); + } + } catch (\Exception $ex) { + $this->log->logException($ex, ['app' => 'core']); } } } |