summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-08-26 10:56:27 +0200
committerVincent Petry <pvince81@owncloud.com>2015-08-26 10:56:27 +0200
commitce6045f84b833c35de5b507c4d15b2a753e476b9 (patch)
treeb3a2c23da769dc3bebc2cb0d4b56efd7abff314c /core
parent90ed32ebc509edc5bf4978c304db79e6140d2b09 (diff)
downloadnextcloud-server-ce6045f84b833c35de5b507c4d15b2a753e476b9.tar.gz
nextcloud-server-ce6045f84b833c35de5b507c4d15b2a753e476b9.zip
Properly show update exception
Diffstat (limited to 'core')
-rw-r--r--core/ajax/update.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index c25ef1b9084..a693deeb9cf 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -89,7 +89,13 @@ if (OC::checkUpgrade(false)) {
OC_Config::setValue('maintenance', false);
});
- $updater->upgrade();
+ try {
+ $updater->upgrade();
+ } catch (\Exception $e) {
+ $eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+ $eventSource->close();
+ exit();
+ }
if (!empty($incompatibleApps)) {
$eventSource->send('notice',