Browse Source
Correctly catch the "soft errors" now
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/2058/head
Joas Schilling
10 years ago
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
1 changed files with
8 additions and
4 deletions
-
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 |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
