summaryrefslogtreecommitdiffstats
path: root/lib/app.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-30 00:37:05 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-30 00:37:05 +0200
commitf658852276204fbf1a76d58ac2f585cf9db8c75d (patch)
tree5fbd6d93c7435022e8539065a45469bd249799ad /lib/app.php
parent085fdfec2f298fd89d0265d0f97edfdda5a12954 (diff)
parent7c6246fa451c4646dfaa1396dd37e0b3eb9706ba (diff)
downloadnextcloud-server-f658852276204fbf1a76d58ac2f585cf9db8c75d.tar.gz
nextcloud-server-f658852276204fbf1a76d58ac2f585cf9db8c75d.zip
Merge branch 'master' into fixing-testGetById-master
Diffstat (limited to 'lib/app.php')
-rw-r--r--lib/app.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php
index baacf508d8e..2437896157a 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -839,9 +839,9 @@ class OC_App{
OC_Hook::emit('update', 'success', 'Updated '.$info['name'].' app');
}
catch (Exception $e) {
- echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"';
OC_Hook::emit('update', 'failure', 'Failed to update '.$info['name'].' app: '.$e->getMessage());
- die;
+ $l = OC_L10N::get('lib');
+ throw new RuntimeException($l->t('Failed to upgrade "%s".', array($app)), 0, $e);
}
OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
}