From aa10cca61b7912e639bbfcd659efa1d92ae18c6b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 27 Apr 2017 18:11:33 -0300 Subject: Do not disable 3rdparty apps on occ upgrade Signed-off-by: Morris Jobke --- core/Command/Upgrade.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'core/Command/Upgrade.php') diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index aec74849fea..2e518f52e21 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -87,12 +87,6 @@ class Upgrade extends Command { */ protected function execute(InputInterface $input, OutputInterface $output) { - $skip3rdPartyAppsDisable = false; - - if ($input->getOption('no-app-disable')) { - $skip3rdPartyAppsDisable = true; - } - if(\OC::checkUpgrade(false)) { if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { // Prepend each line with a little timestamp @@ -107,7 +101,9 @@ class Upgrade extends Command { $this->logger ); - $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable); + if ($input->getOption('no-app-disable')) { + $updater->setSkip3rdPartyAppsDisable(true); + } $dispatcher = \OC::$server->getEventDispatcher(); $progress = new ProgressBar($output); $progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%"); -- cgit v1.2.3