diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-01-16 01:13:54 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-01-16 01:15:43 +0100 |
| commit | 907dd4d24da80fa4f4ad5d6d469cd11d7c215f02 (patch) | |
| tree | 19dfba573847083e1e8e282dcd43c6537b38ad3c /lib/db.php | |
| parent | da33229dab7aefee6f2de0ac6f128feaf767388b (diff) | |
| download | nextcloud-server-907dd4d24da80fa4f4ad5d6d469cd11d7c215f02.tar.gz nextcloud-server-907dd4d24da80fa4f4ad5d6d469cd11d7c215f02.zip | |
some aditional feedback during database upgrade
Diffstat (limited to 'lib/db.php')
| -rw-r--r-- | lib/db.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/db.php b/lib/db.php index f6eddf7825c..1a5f9874bd5 100644 --- a/lib/db.php +++ b/lib/db.php @@ -361,6 +361,11 @@ class OC_DB { $content = file_get_contents( $file ); $previousSchema = self::$schema->getDefinitionFromDatabase(); + if (PEAR::isError($previousSchema)) { + $error = $previousSchema->getMessage(); + OC_Log::write('core','Failed to get existing database structure for upgrading ('.$error.')',OC_Log::FATAL); + return false; + } // Make changes and save them to a temporary file $file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' ); @@ -376,9 +381,9 @@ class OC_DB { unlink( $file2 ); if (PEAR::isError($op)) { - $error = $op->getMessage(); - OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL); - return false; + $error = $op->getMessage(); + OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL); + return false; } return true; } |