Browse Source

Fix rollback.

1.0
Andrés Montañez 10 years ago
parent
commit
2e0c5130dd
  1. 33
      Mage/Task/BuiltIn/Releases/RollbackTask.php

33
Mage/Task/BuiltIn/Releases/RollbackTask.php

@ -23,12 +23,6 @@ use Mage\Task\Releases\RollbackAware;
*/ */
class RollbackTask extends AbstractTask implements IsReleaseAware class RollbackTask extends AbstractTask implements IsReleaseAware
{ {
/**
* The Relase ID to Rollback To
* @var integer
*/
protected $release = null;
/** /**
* (non-PHPdoc) * (non-PHPdoc)
* @see \Mage\Task\AbstractTask::getName() * @see \Mage\Task\AbstractTask::getName()
@ -38,24 +32,13 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
return 'Rollback release [built-in]'; return 'Rollback release [built-in]';
} }
/**
* Sets the Release ID to Rollback To
* @param integer $releaseId
* @return \Mage\Task\BuiltIn\Releases\RollbackTask
*/
public function setRelease($releaseId)
{
$this->release = $releaseId;
return $this;
}
/** /**
* Gets the Release ID to Rollback To * Gets the Release ID to Rollback To
* @return integer * @return integer
*/ */
public function getRelease() public function getReleaseId()
{ {
return $this->release; return $this->getConfig()->getReleaseId();
} }
/** /**
@ -79,25 +62,25 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
rsort($releases); rsort($releases);
$releaseIsAvailable = false; $releaseIsAvailable = false;
if ($this->getRelease() == '') { if ($this->getReleaseId() == '') {
$releaseId = $releases[0]; $releaseId = $releases[0];
$releaseIsAvailable = true; $releaseIsAvailable = true;
} else if ($this->getRelease() <= 0) { } else if ($this->getReleaseId() <= 0) {
$index = $this->getRelease() * -1; $index = $this->getReleaseId() * -1;
if (isset($releases[$index])) { if (isset($releases[$index])) {
$releaseId = $releases[$index]; $releaseId = $releases[$index];
$releaseIsAvailable = true; $releaseIsAvailable = true;
} }
} else { } else {
if (in_array($this->getRelease(), $releases)) { if (in_array($this->getReleaseId(), $releases)) {
$releaseId = $this->getRelease(); $releaseId = $this->getReleaseId();
$releaseIsAvailable = true; $releaseIsAvailable = true;
} }
} }
if (!$releaseIsAvailable) { if (!$releaseIsAvailable) {
Console::output('Release <dark_gray>' . $this->getRelease() . '</dark_gray> is invalid or unavailable for <dark_gray>' . $this->getConfig()->getHost() . '</dark_gray> ... <red>FAIL</red>'); Console::output('Release <dark_gray>' . $this->getReleaseId() . '</dark_gray> is invalid or unavailable for <dark_gray>' . $this->getConfig()->getHost() . '</dark_gray> ... <red>FAIL</red>');
} else { } else {
Console::output('Rollback release on <dark_gray>' . $this->getConfig()->getHost() . '</dark_gray>'); Console::output('Rollback release on <dark_gray>' . $this->getConfig()->getHost() . '</dark_gray>');

Loading…
Cancel
Save