diff options
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/include/vcpkg_Dependencies.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_install.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h index b987a6b38..ac4a13e84 100644 --- a/toolsrc/include/vcpkg_Dependencies.h +++ b/toolsrc/include/vcpkg_Dependencies.h @@ -21,7 +21,7 @@ namespace vcpkg::Dependencies struct install_plan_action { - install_plan_type type; + install_plan_type plan_type; std::unique_ptr<BinaryParagraph> binary_pgh; std::unique_ptr<SourceParagraph> source_pgh; }; diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index b6c3cea03..ccc3c8d9f 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -107,7 +107,7 @@ namespace vcpkg::Commands::Build unmet_dependencies.erase( std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [](const package_spec_with_install_plan& p) { - return p.plan.type == install_plan_type::ALREADY_INSTALLED; + return p.plan.plan_type == install_plan_type::ALREADY_INSTALLED; }), unmet_dependencies.end()); diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index e5c5dd013..0371cc6e5 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -205,21 +205,21 @@ namespace vcpkg::Commands::Install { try { - if (action.plan.type == install_plan_type::ALREADY_INSTALLED) + if (action.plan.plan_type == install_plan_type::ALREADY_INSTALLED) { if (std::find(specs.begin(), specs.end(), action.spec) != specs.end()) { System::println(System::color::success, "Package %s is already installed", action.spec); } } - else if (action.plan.type == install_plan_type::BUILD_AND_INSTALL) + else if (action.plan.plan_type == install_plan_type::BUILD_AND_INSTALL) { Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec)); const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw(); install_package(paths, bpgh, status_db); System::println(System::color::success, "Package %s is installed", action.spec); } - else if (action.plan.type == install_plan_type::INSTALL) + else if (action.plan.plan_type == install_plan_type::INSTALL) { install_package(paths, *action.plan.binary_pgh, status_db); System::println(System::color::success, "Package %s is installed", action.spec); |