diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-30 13:57:43 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-30 21:52:43 -0800 |
| commit | e461467affad578d2e13a5c8f18cc37ee3007938 (patch) | |
| tree | 31e6c8239a6e581fe480ce26e3d283d2e8c3a19d /toolsrc/src/vcpkg_Dependencies.cpp | |
| parent | 9c87fcbd8b7e1cdee148d33ed272ae5ecc83fb60 (diff) | |
| download | vcpkg-e461467affad578d2e13a5c8f18cc37ee3007938.tar.gz vcpkg-e461467affad578d2e13a5c8f18cc37ee3007938.zip | |
[Dependencies] User-requested vs autos-elected info is now in a separate enum
Diffstat (limited to 'toolsrc/src/vcpkg_Dependencies.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Dependencies.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index b0047a772..669cdfc20 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -93,7 +93,7 @@ namespace vcpkg::Dependencies auto it = status_db.find(spec); if (it == status_db.end() || (*it)->state == install_state_t::not_installed) { - was_examined.emplace(spec, remove_plan_action{remove_plan_type::NOT_INSTALLED, nullptr}); + was_examined.emplace(spec, remove_plan_action{remove_plan_type::NOT_INSTALLED, request_type::USER_REQUESTED, nullptr}); continue; } @@ -114,8 +114,8 @@ namespace vcpkg::Dependencies examine_stack.push_back(an_installed_package.get()->package.spec); } - const remove_plan_type type = specs_as_set.find(spec) != specs_as_set.end() ? remove_plan_type::REMOVE_USER_REQUESTED : remove_plan_type::REMOVE_AUTO_SELECTED; - was_examined.emplace(spec, remove_plan_action{type, std::make_unique<StatusParagraph>(std::move(**it))}); + const request_type request_type = specs_as_set.find(spec) != specs_as_set.end() ? request_type::USER_REQUESTED : request_type::AUTO_SELECTED; + was_examined.emplace(spec, remove_plan_action{remove_plan_type::REMOVE, request_type,std::make_unique<StatusParagraph>(std::move(**it))}); } std::vector<package_spec_with_remove_plan> ret; |
