From 59cdb240876efae7d25cbdc239943f3570e4d5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81s=20Montan=CC=83ez?= Date: Wed, 19 Sep 2012 19:26:10 -0300 Subject: [PATCH] Reloads config after SCM Update. --- Mage/Config.php | 7 +++++++ Mage/Task/BuiltIn/Scm/Update.php | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Mage/Config.php b/Mage/Config.php index f189a4f..f833be1 100644 --- a/Mage/Config.php +++ b/Mage/Config.php @@ -8,6 +8,13 @@ class Mage_Config private $_host = null; private $_releaseId = null; + public function reloadConfig() + { + $this->loadGeneral(); + $this->loadSCM(); + $this->loadEnvironment($this->getEnvironmentName()); + } + public function loadEnvironment($environment) { if (($environment != '') && file_exists('.mage/config/environment/' . $environment . '.yml')) { diff --git a/Mage/Task/BuiltIn/Scm/Update.php b/Mage/Task/BuiltIn/Scm/Update.php index f4b7676..f2a2ded 100644 --- a/Mage/Task/BuiltIn/Scm/Update.php +++ b/Mage/Task/BuiltIn/Scm/Update.php @@ -3,12 +3,12 @@ class Mage_Task_BuiltIn_Scm_Update extends Mage_Task_TaskAbstract { private $_name = 'SCM Update [built-in]'; - + public function getName() { return $this->_name; } - + public function init() { switch ($this->_config->scm('type')) { @@ -21,7 +21,7 @@ class Mage_Task_BuiltIn_Scm_Update break; } } - + public function run() { switch ($this->_config->scm('type')) { @@ -35,7 +35,8 @@ class Mage_Task_BuiltIn_Scm_Update } $result = $this->_runLocalCommand($command); - + $this->_config->reloadConfig(); + return $result; } } \ No newline at end of file