From 2f7e291101a5fd2b3f149d0b62fc5f3663115d2b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 9 Nov 2016 10:29:25 +0100
Subject: [PATCH] Correctly catch the "soft errors" now

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/private/Installer.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index fdfa44c143f..aff2d2194aa 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -429,9 +429,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);
@@ -463,7 +466,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
 				);
 			}
 		}