Procházet zdrojové kódy

Trying to fix update behavior.

Matthew Grasmick před 7 roky
rodič
revize
6db92eae92
1 změnil soubory, kde provedl 2 přidání a 2 odebrání
  1. 2 2
      src/Composer/Installer.php

+ 2 - 2
src/Composer/Installer.php

@@ -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;
                         }
                         }