hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-11-04 09:00:18 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Andrés Montañez 2015-01-09 20:47:26 -02:00
commit f04cced989
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mage/Command/BuiltIn/DeployCommand.php
View File

@ -212,6 +212,10 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
$exitCode = 0; $exitCode = 0;
} }
if (self::$deployStatus === self::FAILED) {
$exitCode = 1;
}
return $exitCode; return $exitCode;
} }

2
Mage/Task/Factory.php
View File

@ -59,7 +59,7 @@ class Factory
$instance = new $className($taskConfig, $inRollback, $stage, $taskParameters); $instance = new $className($taskConfig, $inRollback, $stage, $taskParameters);
if (!is_a($instance, 'Mage\Task\AbstractTask')) { if (!($instance instanceof AbstractTask)) {
throw new Exception('The Task ' . $taskName . ' must be an instance of Mage\Task\AbstractTask.'); throw new Exception('The Task ' . $taskName . ' must be an instance of Mage\Task\AbstractTask.');
} }