Skip to content

Commit 5b5d29e

Browse files
author
Kopylova,Olga(okopylova)
committed
Merge pull request #3 from magento-ogre/MAGETWO-48256-update-from-200-to-201
MAGETWO-48256: [Github] Upgrade from 2.0.0 to 2.0.1 fails
2 parents d098eba + 008280a commit 5b5d29e

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

src/MagentoHackathon/Composer/Magento/DeployManager.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,14 @@ public function doDeploy()
9090
if ($this->io->isDebug()) {
9191
$this->io->write('start magento deploy for ' . $package->getPackageName());
9292
}
93-
$package->getDeployStrategy()->deploy();
93+
try {
94+
$package->getDeployStrategy()->deploy();
95+
} catch (\ErrorException $e) {
96+
if ($this->io->isDebug()) {
97+
$this->io->write($e->getMessage());
98+
}
99+
}
100+
94101
}
95102
}
96103
}

src/MagentoHackathon/Composer/Magento/Installer.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,13 @@ public function update(InstalledRepositoryInterface $repo, PackageInterface $ini
608608
if ($this->hasExtraMap($initial)) {
609609
$initialStrategy = $this->getDeployStrategy($initial);
610610
$initialStrategy->setMappings($this->getParser($initial)->getMappings());
611-
$initialStrategy->clean();
611+
try {
612+
$initialStrategy->clean();
613+
} catch (\ErrorException $e) {
614+
if ($this->io->isDebug()) {
615+
$this->io->write($e->getMessage());
616+
}
617+
}
612618
}
613619

614620
parent::update($repo, $initial, $target);
@@ -715,7 +721,13 @@ public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $
715721

716722
$strategy = $this->getDeployStrategy($package);
717723
$strategy->setMappings($this->getParser($package)->getMappings());
718-
$strategy->clean();
724+
try {
725+
$strategy->clean();
726+
} catch (\ErrorException $e) {
727+
if ($this->io->isDebug()) {
728+
$this->io->write($e->getMessage());
729+
}
730+
}
719731

720732
parent::uninstall($repo, $package);
721733
}

0 commit comments

Comments
 (0)