3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg] Revert making remove_package() take status_db by const

Browse Source 
The in-memory database must be updated to communicate to future actions that they need to look at this package's files (or not)
This commit is contained in:
Robert Schumacher 2018-01-23 14:14:01 -08:00
parent 91f447631d
commit 130fa279f9
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolsrc/include/vcpkg/remove.h
View File

@ -17,10 +17,10 @@ namespace vcpkg::Remove
void perform_remove_plan_action(const VcpkgPaths& paths,
const Dependencies::RemovePlanAction& action,
const Purge purge,
const StatusParagraphs& status_db);
StatusParagraphs* status_db);
extern const CommandStructure COMMAND_STRUCTURE;
void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, const StatusParagraphs& status_db);
void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db);
}

2
toolsrc/src/vcpkg/install.cpp
View File

@ -386,7 +386,7 @@ namespace vcpkg::Install
}
else if (const auto remove_action = action.remove_action.get())
{
Remove::perform_remove_plan_action(paths, *remove_action, Remove::Purge::YES, status_db);
Remove::perform_remove_plan_action(paths, *remove_action, Remove::Purge::YES, &status_db);
}
else
{

10
toolsrc/src/vcpkg/remove.cpp
View File

@ -18,10 +18,10 @@ namespace vcpkg::Remove
using Dependencies::RequestType;
using Update::OutdatedPackage;
void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, const StatusParagraphs& status_db)
void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db)
{
auto& fs = paths.get_filesystem();
auto maybe_ipv = status_db.find_all_installed(spec);
auto maybe_ipv = status_db->find_all_installed(spec);
Checks::check_exit(
VCPKG_LINE_INFO, maybe_ipv.has_value(), "unable to remove package %s: already removed", spec);
@ -106,6 +106,8 @@ namespace vcpkg::Remove
{
spgh.state = InstallState::NOT_INSTALLED;
write_update(paths, spgh);
status_db->insert(std::make_unique<StatusParagraph>(std::move(spgh)));
}
}
@ -143,7 +145,7 @@ namespace vcpkg::Remove
void perform_remove_plan_action(const VcpkgPaths& paths,
const RemovePlanAction& action,
const Purge purge,
const StatusParagraphs& status_db)
StatusParagraphs* status_db)
{
const std::string display_name = action.spec.to_string();
@ -285,7 +287,7 @@ namespace vcpkg::Remove
for (const RemovePlanAction& action : remove_plan)
{
perform_remove_plan_action(paths, action, purge, status_db);
perform_remove_plan_action(paths, action, purge, &status_db);
}
Checks::exit_success(VCPKG_LINE_INFO);