[Pkg-owncloud-commits] [owncloud] 282/457: Merge pull request #16434 from owncloud/persist-maintenance-state
David Prévot
taffit at moszumanska.debian.org
Sun Jun 28 20:06:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit 739c3f01aa32a4de6f671f72fc9cc216d02972d2
Merge: 69d1e7a 064f520
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date: Wed Jun 3 13:56:17 2015 +0200
Merge pull request #16434 from owncloud/persist-maintenance-state
Persist the state of the maintenance after an upgrade
core/ajax/update.php | 7 +++++--
core/command/upgrade.php | 11 ++++++++---
lib/private/updater.php | 18 ++++++++++++++----
3 files changed, 27 insertions(+), 9 deletions(-)
diff --cc core/command/upgrade.php
index 85bd430,786e2e2..2d6394f
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@@ -116,14 -106,18 +116,19 @@@ class Upgrade extends Command
$updater->setSimulateStepEnabled($simulateStepEnabled);
$updater->setUpdateStepEnabled($updateStepEnabled);
+ $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable);
- $updater->listen('\OC\Updater', 'maintenanceStart', function () use($output) {
+ $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) {
$output->writeln('<info>Turned on maintenance mode</info>');
});
- $updater->listen('\OC\Updater', 'maintenanceEnd',
+ $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use($output) {
+ $output->writeln('<info>Turned off maintenance mode</info>');
+ });
+ $updater->listen('\OC\Updater', 'maintenanceActive', function () use($output) {
+ $output->writeln('<info>Maintenance mode is kept active</info>');
+ });
+ $updater->listen('\OC\Updater', 'updateEnd',
function () use($output, $updateStepEnabled, $self) {
- $output->writeln('<info>Turned off maintenance mode</info>');
$mode = $updateStepEnabled ? 'Update' : 'Update simulation';
$status = $self->upgradeFailed ? 'failed' : 'successful';
$message = "<info>$mode $status</info>";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list