From b8dbec0da464069cea065eb413b0c3fb0e3971d1 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 28 Oct 2013 22:19:15 +0100 Subject: Use "else if" to remove one level of indentation. --- core/command/upgrade.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'core/command/upgrade.php') diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 7f03769a609..03976e59bd8 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -72,20 +72,18 @@ class Upgrade extends Command { $updater->upgrade(); return self::ERROR_SUCCESS; + } else if(\OC_Config::getValue('maintenance', false)) { + //Possible scenario: ownCloud core is updated but an app failed + $output->writeln('ownCloud is in maintenance mode'); + $output->write('Maybe an upgrade is already in process. Please check the ' + . 'logfile (data/owncloud.log). If you want to re-run the ' + . 'upgrade procedure, remove the "maintenance mode" from ' + . 'config.php and call this script again.' + , true); + return self::ERROR_MAINTENANCE_MODE; } else { - if(\OC_Config::getValue('maintenance', false)) { - //Possible scenario: ownCloud core is updated but an app failed - $output->writeln('ownCloud is in maintenance mode'); - $output->write('Maybe an upgrade is already in process. Please check the ' - . 'logfile (data/owncloud.log). If you want to re-run the ' - . 'upgrade procedure, remove the "maintenance mode" from ' - . 'config.php and call this script again.' - , true); - return self::ERROR_MAINTENANCE_MODE; - } else { - $output->writeln('ownCloud is already latest version'); - return self::ERROR_UP_TO_DATE; - } + $output->writeln('ownCloud is already latest version'); + return self::ERROR_UP_TO_DATE; } } } -- cgit v1.2.3