summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSteffen Lindner <mail@steffen-lindner.de>2015-05-20 17:06:00 +0200
committerSteffen Lindner <mail@steffen-lindner.de>2015-05-21 11:32:17 +0200
commit6eb8bdb5c9439e9048099a51594140d88556461e (patch)
tree5dbac48dca5665ca3ffd50e8904fb9bfaa027350 /core
parent3bc312ef9a5936b13492194565d5fddc1f920e49 (diff)
downloadnextcloud-server-6eb8bdb5c9439e9048099a51594140d88556461e.tar.gz
nextcloud-server-6eb8bdb5c9439e9048099a51594140d88556461e.zip
Skip disable3rdParty Apps
Diffstat (limited to 'core')
-rw-r--r--core/command/upgrade.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 8c3fbacb3f4..a4a5be21096 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -53,6 +53,12 @@ class Upgrade extends Command {
null,
InputOption::VALUE_NONE,
'only runs the database schema migration simulation, do not actually update'
+ )
+ ->addOption(
+ '--no-app-disable',
+ null,
+ InputOption::VALUE_NONE,
+ 'skips the disable of third party apps'
);
}
@@ -66,6 +72,7 @@ class Upgrade extends Command {
$simulateStepEnabled = true;
$updateStepEnabled = true;
+ $skip3rdPartyAppsDisable = false;
if ($input->getOption('skip-migration-test')) {
$simulateStepEnabled = false;
@@ -73,6 +80,9 @@ class Upgrade extends Command {
if ($input->getOption('dry-run')) {
$updateStepEnabled = false;
}
+ if ($input->getOption('no-app-disable')) {
+ $skip3rdPartyAppsDisable = true;
+ }
if (!$simulateStepEnabled && !$updateStepEnabled) {
$output->writeln(
@@ -89,6 +99,7 @@ class Upgrade extends Command {
$updater->setSimulateStepEnabled($simulateStepEnabled);
$updater->setUpdateStepEnabled($updateStepEnabled);
+ $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable);
$updater->listen('\OC\Updater', 'maintenanceStart', function () use($output) {
$output->writeln('<info>Turned on maintenance mode</info>');
@@ -110,7 +121,7 @@ class Upgrade extends Command {
$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
$output->writeln('<info>Disabled incompatible app: ' . $app . '</info>');
});
- $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use($output) {
+ $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
$output->writeln('<info>Disabled 3rd-party app: ' . $app . '</info>');
});
$updater->listen('\OC\Updater', 'repairWarning', function ($app) use($output) {
@@ -125,7 +136,6 @@ class Upgrade extends Command {
$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) {
$output->writeln("<info>Updated <$app> to $version</info>");
});
-
$updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) {
$output->writeln("<error>$message</error>");
$self->upgradeFailed = true;