The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vcpkg] Warn on unmatched removal with reasonable alternative (#11083)

Browse Source
This commit is contained in:
Robert Schumacher 2020-04-30 09:43:55 -07:00 committed by GitHub
parent e1381361d5
commit 3ae3bd3445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,10 +178,8 @@ namespace vcpkg::Remove
if (purge == Purge::YES) if (purge == Purge::YES)
{ {
System::printf("Purging package %s...\n", display_name);
Files::Filesystem& fs = paths.get_filesystem(); Files::Filesystem& fs = paths.get_filesystem();
fs.remove_all(paths.packages / action.spec.dir(), VCPKG_LINE_INFO); fs.remove_all(paths.packages / action.spec.dir(), VCPKG_LINE_INFO);
System::printf(System::Color::success, "Purging package %s... done\n", display_name);
} }
} }
@ -193,7 +191,7 @@ namespace vcpkg::Remove
static constexpr std::array<CommandSwitch, 5> SWITCHES = {{ static constexpr std::array<CommandSwitch, 5> SWITCHES = {{
{OPTION_PURGE, "Remove the cached copy of the package (default)"}, {OPTION_PURGE, "Remove the cached copy of the package (default)"},
{OPTION_NO_PURGE, "Do not remove the cached copy of the package"}, {OPTION_NO_PURGE, "Do not remove the cached copy of the package (deprecated)"},
{OPTION_RECURSE, "Allow removal of packages not explicitly specified on the command line"}, {OPTION_RECURSE, "Allow removal of packages not explicitly specified on the command line"},
{OPTION_DRY_RUN, "Print the packages to be removed, but do not remove them"}, {OPTION_DRY_RUN, "Print the packages to be removed, but do not remove them"},
{OPTION_OUTDATED, "Select all packages with versions that do not match the portfiles"}, {OPTION_OUTDATED, "Select all packages with versions that do not match the portfiles"},
@ -294,6 +292,27 @@ namespace vcpkg::Remove
} }
} }
for (const auto& action : remove_plan)
{
if (action.plan_type == RemovePlanType::NOT_INSTALLED && action.request_type == RequestType::USER_REQUESTED)
{
// The user requested removing a package that was not installed. If the port is installed for another
// triplet, warn the user that they may have meant that other package.
for (const auto& package : status_db)
{
if (package->is_installed() && !package->package.is_feature() &&
package->package.spec.name() == action.spec.name())
{
System::print2(
System::Color::warning,
"Another installed package matches the name of an unmatched request. Did you mean ",
package->package.spec,
"?\n");
}
}
}
}
if (dry_run) if (dry_run)
{ {
Checks::exit_success(VCPKG_LINE_INFO); Checks::exit_success(VCPKG_LINE_INFO);