From 438e860f0a7df92d013ef15f6c53bd6316854816 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 20 Feb 2023 14:33:06 +0100 Subject: [PATCH] Fail the repair command when an error happened Signed-off-by: Joas Schilling --- core/Command/Maintenance/Repair.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php index 2a3d7a908e2..91963b6dd0b 100644 --- a/core/Command/Maintenance/Repair.php +++ b/core/Command/Maintenance/Repair.php @@ -52,6 +52,8 @@ class Repair extends Command { private $output; /** @var IAppManager */ private $appManager; + /** @var bool */ + protected $errored = false; /** * @param \OC\Repair $repair @@ -109,6 +111,8 @@ class Repair extends Command { } } + + $maintenanceMode = $this->config->getSystemValueBool('maintenance'); $this->config->setSystemValue('maintenance', true); @@ -125,7 +129,7 @@ class Repair extends Command { $this->repair->run(); $this->config->setSystemValue('maintenance', $maintenanceMode); - return 0; + return $this->errored ? 1 : 0; } public function handleRepairFeedBack($event) { @@ -154,6 +158,7 @@ class Repair extends Command { break; case '\OC\Repair::error': $this->output->writeln(' - ERROR: ' . $event->getArgument(0) . ''); + $this->errored = true; break; } }