From: Joas Schilling <coding@schilljs.com>
Date: Wed, 9 Nov 2016 09:29:25 +0000 (+0100)
Subject: Correctly catch the "soft errors" now
X-Git-Tag: v10.0.2~64^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F2059%2Fhead;p=nextcloud-server.git

Correctly catch the "soft errors" now

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index cb2b841dca9..2a0a6ed4edb 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -533,9 +533,12 @@ class Installer {
 									if ($softErrors) {
 										try {
 											Installer::installShippedApp($filename);
-										} catch (\Doctrine\DBAL\Exception\TableExistsException $e) {
-											$errors[$filename] = $e;
-											continue;
+										} catch (HintException $e) {
+											if ($e->getPrevious() instanceof TableExistsException) {
+												$errors[$filename] = $e;
+												continue;
+											}
+											throw $e;
 										}
 									} else {
 										Installer::installShippedApp($filename);
@@ -567,7 +570,8 @@ class Installer {
 			} catch (TableExistsException $e) {
 				throw new HintException(
 					'Failed to enable app ' . $app,
-					'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer">support channels</a>.'
+					'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer">support channels</a>.',
+					0, $e
 				);
 			}
 		}