From 224dfaf1e60ce9c6493ffb0449bdfcca5f31ec29 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 9 Nov 2016 09:10:32 +0100
Subject: Use a better error message and point the users to the support
 channels

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/private/Installer.php | 10 +++++++++-
 lib/private/Updater.php   |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 2366b762654..fdfa44c143f 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -41,6 +41,7 @@
 
 namespace OC;
 
+use Doctrine\DBAL\Exception\TableExistsException;
 use OC\App\AppStore\Fetcher\AppFetcher;
 use OC\App\CodeChecker\CodeChecker;
 use OC\App\CodeChecker\EmptyCheck;
@@ -457,7 +458,14 @@ class Installer {
 		//install the database
 		$appPath = OC_App::getAppPath($app);
 		if(is_file("$appPath/appinfo/database.xml")) {
-			OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
+			try {
+				OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
+			} 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>.'
+				);
+			}
 		}
 
 		//run appinfo/install.php
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index e7f7a944902..2fed67988b8 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -121,6 +121,10 @@ class Updater extends BasicEmitter {
 		$success = true;
 		try {
 			$this->doUpgrade($currentVersion, $installedVersion);
+		} catch (HintException $exception) {
+			$this->log->logException($exception, ['app' => 'core']);
+			$this->emit('\OC\Updater', 'failure', array($exception->getMessage() . ': ' .$exception->getHint()));
+			$success = false;
 		} catch (\Exception $exception) {
 			$this->log->logException($exception, ['app' => 'core']);
 			$this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage()));
-- 
cgit v1.2.3


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: 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
 				);
 			}
 		}
-- 
cgit v1.2.3