3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-01 13:37:55 +08:00
Code Issues Projects Releases Wiki Activity

Fix install plan to not include already installed packages

Browse Source 
(unless they are explicitly requested by the user)
This commit is contained in:
Alexander Karatarakis 2017-04-07 14:47:27 -07:00
parent c91ac99d4a
commit c4d5763a53
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
toolsrc/src/vcpkg_Dependencies.cpp
View File

@ -70,6 +70,12 @@ namespace vcpkg::Dependencies
for (const std::string& dep_as_string : dependencies_as_string)
{
const PackageSpec current_dep = PackageSpec::from_name_and_triplet(dep_as_string, spec.target_triplet()).value_or_exit(VCPKG_LINE_INFO);
auto it = status_db.find_installed(current_dep);
if (it != status_db.end())
{
continue;
}
graph.add_edge(spec, current_dep);
if (was_examined.find(current_dep) == was_examined.end())
{
@ -79,8 +85,8 @@ namespace vcpkg::Dependencies
};
const RequestType request_type = specs_as_set.find(spec) != specs_as_set.end() ? RequestType::USER_REQUESTED : RequestType::AUTO_SELECTED;
auto it = status_db.find(spec);
if (it != status_db.end() && (*it)->want == Want::INSTALL)
auto it = status_db.find_installed(spec);
if (it != status_db.end())
{
was_examined.emplace(spec, InstallPlanAction{ InstallPlanType::ALREADY_INSTALLED, request_type, nullopt, nullopt });
continue;