From 5ff536b45ad6f9c4490a9d949353c6aeea26d7f1 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 23 Jun 2015 10:22:24 +0200 Subject: [PATCH] [upgrade] add verbosity check and show repair info & steps --- core/command/upgrade.php | 9 +++++++++ lib/private/updater.php | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/core/command/upgrade.php b/core/command/upgrade.php index cf376148a00..c4f724d7e0a 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -168,6 +168,15 @@ class Upgrade extends Command { $output->writeln("$message"); }); + if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { + $updater->listen('\OC\Updater', 'repairInfo', function ($message) use($output) { + $output->writeln('Repair info: ' . $message . ''); + }); + $updater->listen('\OC\Updater', 'repairStep', function ($message) use($output) { + $output->writeln('Repair step: ' . $message . ''); + }); + } + $success = $updater->upgrade(); $this->postUpgradeCheck($input, $output); diff --git a/lib/private/updater.php b/lib/private/updater.php index 00c6569a52f..b011cf147e3 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -238,6 +238,12 @@ class Updater extends BasicEmitter { $repair->listen('\OC\Repair', 'error', function ($description) { $this->emit('\OC\Updater', 'repairError', array($description)); }); + $repair->listen('\OC\Repair', 'info', function ($description) { + $this->emit('\OC\Updater', 'repairInfo', array($description)); + }); + $repair->listen('\OC\Repair', 'step', function ($description) { + $this->emit('\OC\Updater', 'repairStep', array($description)); + }); } /**