Merge pull request #5829 from fabpot/post-dependencies-solving-bug
Fix POST_DEPENDENCIES_SOLVING triggerpull/5843/head
commit
e32c09e13a
|
@ -459,7 +459,6 @@ class Installer
|
||||||
$solver = new Solver($policy, $pool, $installedRepo, $this->io);
|
$solver = new Solver($policy, $pool, $installedRepo, $this->io);
|
||||||
try {
|
try {
|
||||||
$operations = $solver->solve($request, $this->ignorePlatformReqs);
|
$operations = $solver->solve($request, $this->ignorePlatformReqs);
|
||||||
$this->eventDispatcher->dispatchInstallerEvent(InstallerEvents::POST_DEPENDENCIES_SOLVING, $this->devMode, $policy, $pool, $installedRepo, $request, $operations);
|
|
||||||
} catch (SolverProblemsException $e) {
|
} catch (SolverProblemsException $e) {
|
||||||
$this->io->writeError('<error>Your requirements could not be resolved to an installable set of packages.</error>', true, IOInterface::QUIET);
|
$this->io->writeError('<error>Your requirements could not be resolved to an installable set of packages.</error>', true, IOInterface::QUIET);
|
||||||
$this->io->writeError($e->getMessage());
|
$this->io->writeError($e->getMessage());
|
||||||
|
@ -467,12 +466,14 @@ class Installer
|
||||||
return array(max(1, $e->getCode()), array());
|
return array(max(1, $e->getCode()), array());
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->io->writeError("Analyzed ".count($pool)." packages to resolve dependencies", true, IOInterface::VERBOSE);
|
|
||||||
$this->io->writeError("Analyzed ".$solver->getRuleSetSize()." rules to resolve dependencies", true, IOInterface::VERBOSE);
|
|
||||||
|
|
||||||
// force dev packages to be updated if we update or install from a (potentially new) lock
|
// force dev packages to be updated if we update or install from a (potentially new) lock
|
||||||
$operations = $this->processDevPackages($localRepo, $pool, $policy, $repositories, $installedRepo, $lockedRepository, 'force-updates', $operations);
|
$operations = $this->processDevPackages($localRepo, $pool, $policy, $repositories, $installedRepo, $lockedRepository, 'force-updates', $operations);
|
||||||
|
|
||||||
|
$this->eventDispatcher->dispatchInstallerEvent(InstallerEvents::POST_DEPENDENCIES_SOLVING, $this->devMode, $policy, $pool, $installedRepo, $request, $operations);
|
||||||
|
|
||||||
|
$this->io->writeError("Analyzed ".count($pool)." packages to resolve dependencies", true, IOInterface::VERBOSE);
|
||||||
|
$this->io->writeError("Analyzed ".$solver->getRuleSetSize()." rules to resolve dependencies", true, IOInterface::VERBOSE);
|
||||||
|
|
||||||
// execute operations
|
// execute operations
|
||||||
if (!$operations) {
|
if (!$operations) {
|
||||||
$this->io->writeError('Nothing to install or update');
|
$this->io->writeError('Nothing to install or update');
|
||||||
|
|
Loading…
Reference in New Issue