Merge pull request #4570 from nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade

Do not disable 3rdparty apps on occ upgrade
This commit is contained in:
Lukas Reschke 2017-04-28 08:33:28 +02:00 committed by GitHub
commit a809aa51cd
1 changed files with 3 additions and 7 deletions

View File

@ -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%%");