diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-11-02 09:40:10 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2016-11-02 10:00:14 +0100 |
| commit | 9b66e8f7d96cc5ca014d3f6b8031eb380d981adb (patch) | |
| tree | 8fe9d494a7eeb73e06d8f0fa6875bcb6fed6d94c /lib | |
| parent | 19af06cdea5719226d851bf4ad531220d2d37bed (diff) | |
| download | nextcloud-server-9b66e8f7d96cc5ca014d3f6b8031eb380d981adb.tar.gz nextcloud-server-9b66e8f7d96cc5ca014d3f6b8031eb380d981adb.zip | |
Throw an exception when a shipped app was not replaced before the update
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 12 | ||||
| -rw-r--r-- | lib/private/Updater.php | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index e7bedb69596..40e48289102 100644 --- a/lib/base.php +++ b/lib/base.php @@ -377,6 +377,7 @@ class OC { \OCP\Util::addScript('update'); \OCP\Util::addStyle('update'); + /** @var \OCP\App\IAppManager $appManager */ $appManager = \OC::$server->getAppManager(); $tmpl = new OC_Template('', 'update.admin', 'guest'); @@ -385,8 +386,17 @@ class OC { // get third party apps $ocVersion = \OCP\Util::getVersion(); + $incompatibleApps = $appManager->getIncompatibleApps($ocVersion); + foreach ($incompatibleApps as $appInfo) { + if ($appManager->isShipped($appInfo['id'])) { + $l = \OC::$server->getL10N('core'); + $hint = $l->t('The files of the app "%$1s" (%$2s) were not replaced correctly.', [$appInfo['name'], $appInfo['id']]); + throw new \OC\HintException('The files of the app "' . $appInfo['name'] . '" (' . $appInfo['id'] . ') were not replaced correctly.', $hint); + } + } + $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion)); - $tmpl->assign('incompatibleAppsList', $appManager->getIncompatibleApps($ocVersion)); + $tmpl->assign('incompatibleAppsList', $incompatibleApps); $tmpl->assign('productName', 'Nextcloud'); // for now $tmpl->assign('oldTheme', $oldTheme); $tmpl->printPage(); diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 646fc031a83..91f24b903b8 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -381,6 +381,9 @@ class Updater extends BasicEmitter { // check if the app is compatible with this version of ownCloud $info = OC_App::getAppInfo($app); if(!OC_App::isAppCompatible($version, $info)) { + if (OC_App::isShipped($app)) { + throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update'); + } OC_App::disable($app); $this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app)); } |