summaryrefslogtreecommitdiffstats
path: root/lib/db.php
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-01-05 09:33:29 -0800
committerMichael Gapczynski <mtgap@owncloud.com>2013-01-05 09:33:29 -0800
commitda7a14e9a6cc5a388ae817a226af7fa262fe6846 (patch)
tree32901cc0472166121c1f1a99c78c41dbb4a7d232 /lib/db.php
parent0c6213a371059952bc2393563ad93ca74fbdddfc (diff)
parent035d0aa9d5b2768672af89ddd543913ec1f6b657 (diff)
downloadnextcloud-server-da7a14e9a6cc5a388ae817a226af7fa262fe6846.tar.gz
nextcloud-server-da7a14e9a6cc5a388ae817a226af7fa262fe6846.zip
Merge pull request #1079 from owncloud/update-progress
Updater progress feedback
Diffstat (limited to 'lib/db.php')
-rw-r--r--lib/db.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/db.php b/lib/db.php
index 7e60b41d230..74e7ca5b0e0 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -495,8 +495,9 @@ class OC_DB {
if (PEAR::isError($previousSchema)) {
$error = $previousSchema->getMessage();
$detail = $previousSchema->getDebugInfo();
- OC_Log::write('core', 'Failed to get existing database structure for upgrading ('.$error.', '.$detail.')', OC_Log::FATAL);
- return false;
+ $message = 'Failed to get existing database structure for updating ('.$error.', '.$detail.')';
+ OC_Log::write('core', $message, OC_Log::FATAL);
+ throw new Exception($message);
}
// Make changes and save them to an in-memory file
@@ -523,8 +524,9 @@ class OC_DB {
if (PEAR::isError($op)) {
$error = $op->getMessage();
$detail = $op->getDebugInfo();
- OC_Log::write('core', 'Failed to update database structure ('.$error.', '.$detail.')', OC_Log::FATAL);
- return false;
+ $message = 'Failed to update database structure ('.$error.', '.$detail.')';
+ OC_Log::write('core', $message, OC_Log::FATAL);
+ throw new Exception($message);
}
return true;
}