[Pkg-owncloud-commits] [owncloud] 04/11: forward repair events to updater

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 2ce22eeefbac5eb3355298f8ad3c9ff5c3303fd4
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Aug 18 13:15:27 2015 +0200

    forward repair events to updater
    
    * fixes #17313
    * already in stable8+: 22bc37cb82368fba912a9e5a5ef0e87017d04b1e - #13513
---
 lib/private/updater.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/private/updater.php b/lib/private/updater.php
index 64f8dc3..b3f8655 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -209,6 +209,7 @@ class Updater extends BasicEmitter {
 
 		// pre-upgrade repairs
 		$repair = new \OC\Repair(\OC\Repair::getBeforeUpgradeRepairSteps());
+		$this->emitRepairMessages($repair);
 		$repair->run();
 
 		// simulate DB upgrade
@@ -239,6 +240,7 @@ class Updater extends BasicEmitter {
 
 			// post-upgrade repairs
 			$repair = new \OC\Repair(\OC\Repair::getRepairSteps());
+			$this->emitRepairMessages($repair);
 			$repair->run();
 
 			//Invalidate update feed
@@ -249,6 +251,12 @@ class Updater extends BasicEmitter {
 		}
 	}
 
+	protected function emitRepairMessages(Repair $repair) {
+		$repair->listen('\OC\Repair', 'info', function($description){
+			$this->emit('\OC\Repair', 'info', array($description));
+		});
+	}
+
 	protected function checkCoreUpgrade() {
 		// simulate core DB upgrade
 		\OC_DB::simulateUpdateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git