public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix error detection to support replaces and provides

pull/134/head
Jordi Boggiano 2011-11-24 09:57:08 +01:00
parent bd1c18d934
commit eef37c450f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Command/InstallCommand.php
View File

@ -130,12 +130,15 @@ EOT
foreach ($request->getJobs() as $job) { foreach ($request->getJobs() as $job) {
if ('install' === $job['cmd']) { if ('install' === $job['cmd']) {
foreach ($installedRepo->getPackages() as $package) { foreach ($installedRepo->getPackages() as $package) {
if ($job['packageName'] === $package->getName()) { if (in_array($job['packageName'], $package->getNames())) {
continue 2; continue 2;
} }
} }
foreach ($operations as $operation) { foreach ($operations as $operation) {
if ('install' === $operation->getJobType() && $job['packageName'] === $operation->getPackage()->getName()) { if ('install' === $operation->getJobType() && in_array($job['packageName'], $operation->getPackage()->getNames())) {
continue 2;
}
if ('update' === $operation->getJobType() && in_array($job['packageName'], $operation->getTargetPackage()->getNames())) {
continue 2; continue 2;
} }
} }