diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-23 13:37:38 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-23 13:37:38 +0200 |
| commit | 6fdd1d094f3a55718b75568711a36969040949be (patch) | |
| tree | 203898064246c908cb0226574af45aa945014588 | |
| parent | 6ee4fe56db31bd193d27f046ac70f3ceec62b818 (diff) | |
| parent | d48ab2b0513ce861df4212626b84b018849829d5 (diff) | |
| download | nextcloud-server-6fdd1d094f3a55718b75568711a36969040949be.tar.gz nextcloud-server-6fdd1d094f3a55718b75568711a36969040949be.zip | |
Merge pull request #17020 from owncloud/stable7-proper-repair-step-info
Proper repair step info during upgrade on cli
| -rw-r--r-- | core/command/upgrade.php | 3 | ||||
| -rw-r--r-- | lib/repair/collation.php | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php index d037082c5e8..22f4293149f 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 2247cf82d0a..315969b7313 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")); } } |