diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-01-06 18:53:32 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-01-06 18:53:32 +0000 |
| commit | a68b597e83d22c82d1bf784b1245e03baafd4820 (patch) | |
| tree | 9b920413ec801b2a0ba624123c4e66aad9466b9e /lib/app.php | |
| parent | 015787fbb3152661144d21119bb9ea662a8ba0a3 (diff) | |
| parent | 08d7b8ce309baebfc243727c215b63e732bf874e (diff) | |
| download | nextcloud-server-a68b597e83d22c82d1bf784b1245e03baafd4820.tar.gz nextcloud-server-a68b597e83d22c82d1bf784b1245e03baafd4820.zip | |
Merge branch 'master' into files_encryption
Diffstat (limited to 'lib/app.php')
| -rw-r--r-- | lib/app.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/app.php b/lib/app.php index 30f76300365..e60bce2a201 100644 --- a/lib/app.php +++ b/lib/app.php @@ -648,12 +648,15 @@ class OC_App{ if ($currentVersion) { $installedVersion = $versions[$app]; if (version_compare($currentVersion, $installedVersion, '>')) { + $info = self::getAppInfo($app); OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG); try { OC_App::updateApp($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; } OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app)); @@ -678,6 +681,7 @@ class OC_App{ if(!isset($info['require']) or (($version[0].'.'.$version[1])>$info['require'])) { OC_Log::write('core', 'App "'.$info['name'].'" ('.$app.') can\'t be used because it is not compatible with this version of ownCloud', OC_Log::ERROR); OC_App::disable( $app ); + OC_Hook::emit('update', 'success', 'Disabled '.$info['name'].' app because it is not compatible'); } } } |