From 04809b603795d19c02f7a95c93146186593729b8 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 27 Feb 2015 12:44:04 +0100 Subject: Properly forward repair errors and warnings This makes repair errors and warnings visible for the user when upgrading on the command line or in the web UI. --- core/command/maintenance/repair.php | 3 +++ core/command/upgrade.php | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'core/command') diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php index bf94b2647ce..bf2cac32ff9 100644 --- a/core/command/maintenance/repair.php +++ b/core/command/maintenance/repair.php @@ -46,6 +46,9 @@ class Repair extends Command { $this->repair->listen('\OC\Repair', 'info', function ($description) use ($output) { $output->writeln(' - ' . $description); }); + $this->repair->listen('\OC\Repair', 'warning', function ($description) use ($output) { + $output->writeln(' - WARNING: ' . $description); + }); $this->repair->listen('\OC\Repair', 'error', function ($description) use ($output) { $output->writeln(' - ERROR: ' . $description); }); diff --git a/core/command/upgrade.php b/core/command/upgrade.php index e5402796136..8c3fbacb3f4 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -113,6 +113,12 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use($output) { $output->writeln('Disabled 3rd-party app: ' . $app . ''); }); + $updater->listen('\OC\Updater', 'repairWarning', function ($app) use($output) { + $output->writeln('Repair warning: ' . $app . ''); + }); + $updater->listen('\OC\Updater', 'repairError', function ($app) use($output) { + $output->writeln('Repair error: ' . $app . ''); + }); $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) { $output->writeln('Checked database schema update for apps'); }); -- cgit v1.2.3