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

Trying to fix update behavior.

pull/6674/head
Matthew Grasmick 2017-09-11 12:27:20 -04:00
parent ad465aa769
commit 6db92eae92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Installer.php
View File

@ -1362,11 +1362,11 @@ class Installer
$requirePackages = $pool->whatProvides($require->getTarget()); $requirePackages = $pool->whatProvides($require->getTarget());
foreach ($requirePackages as $requirePackage) { foreach ($requirePackages as $requirePackage) {
if (!$this->whitelistAllDependencies && isset($this->updateWhitelist[$requirePackage->getName()])) { if (isset($this->updateWhitelist[$requirePackage->getName()])) {
continue; continue;
} }
if (isset($skipPackages[$requirePackage->getName()])) { if (!$this->whitelistAllDependencies && isset($skipPackages[$requirePackage->getName()])) {
$this->io->writeError('<warning>Dependency "' . $requirePackage->getName() . '" is also a root requirement, but is not explicitly whitelisted. Ignoring.</warning>'); $this->io->writeError('<warning>Dependency "' . $requirePackage->getName() . '" is also a root requirement, but is not explicitly whitelisted. Ignoring.</warning>');
continue; continue;
} }