[Pkg-owncloud-commits] [owncloud] 20/36: Proper repair step info during upgrade on cli

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit d48ab2b0513ce861df4212626b84b018849829d5
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Thu Jun 18 16:49:20 2015 +0200

    Proper repair step info during upgrade on cli
---
 core/command/upgrade.php | 3 +++
 lib/repair/collation.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index d037082..22f4293 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -101,6 +101,9 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'disabledApps', function ($appList) use($output) {
 				$output->writeln('<info>Disabled incompatible apps: ' . implode(', ', $appList) . '</info>');
 			});
+			$updater->listen('\OC\Repair', 'info', function ($message) use($output) {
+				$output->writeln('<info>Repair info: ' . $message . '</info>');
+			});
 
 			$updater->listen('\OC\Updater', 'failure', function ($message) use($output) {
 				$output->writeln($message);
diff --git a/lib/repair/collation.php b/lib/repair/collation.php
index 2247cf8..315969b 100644
--- a/lib/repair/collation.php
+++ b/lib/repair/collation.php
@@ -48,6 +48,7 @@ class Collation extends BasicEmitter implements \OC\RepairStep {
 		foreach ($tables as $table) {
 			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;');
 			$query->execute();
+			$this->emit('\OC\Repair', 'info', array("Changed collation for $table"));
 		}
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git