diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-14 16:01:19 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-14 16:01:19 -0700 |
| commit | 1c08a42091cb0addd1e0c1daf27d24bf4e9d237f (patch) | |
| tree | f8c69e701dfae791fe180a8c24b35a4195668afd /toolsrc/src/commands_build.cpp | |
| parent | 23366aede0cb1ccfeac85a28308bc722811b18bc (diff) | |
| parent | b3541eff15847b2cc90736a609b8c6f99ce74a9d (diff) | |
| download | vcpkg-1c08a42091cb0addd1e0c1daf27d24bf4e9d237f.tar.gz vcpkg-1c08a42091cb0addd1e0c1daf27d24bf4e9d237f.zip | |
Merge from master
Diffstat (limited to 'toolsrc/src/commands_build.cpp')
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 9110e1fd0..ab792f1bc 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -150,9 +150,9 @@ namespace vcpkg::Commands::Build if (result == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES) { std::vector<InstallPlanAction> unmet_dependencies = Dependencies::create_install_plan(paths, { spec }, status_db); - Util::keep_if(unmet_dependencies, [&spec](const InstallPlanAction& p) + Util::erase_remove_if(unmet_dependencies, [&spec](const InstallPlanAction& p) { - return (p.spec != spec) && (p.plan_type != InstallPlanType::ALREADY_INSTALLED); + return (p.spec == spec) || (p.plan_type == InstallPlanType::ALREADY_INSTALLED); }); Checks::check_exit(VCPKG_LINE_INFO, !unmet_dependencies.empty()); |