From c17fa88c53bd8dbd9b132627e35302e0c44e5207 Mon Sep 17 00:00:00 2001 From: Jaroslav Rohel Date: Mon, 6 Jan 2025 16:05:25 +0100 Subject: [PATCH] DNF5 bash completion: Offer package NAMEs in all cases For installed packages (for dnf5 commands reinstall, remove, repoquery, swap) bash completion offered only NEVRAs. Now bash completion for dnf5 offers NAMEs in addition to NEVRAs in all cases. --- dnf5/commands/reinstall/reinstall.cpp | 2 +- dnf5/commands/remove/remove.cpp | 2 +- dnf5/commands/repoquery/repoquery.cpp | 2 +- dnf5/commands/swap/swap.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnf5/commands/reinstall/reinstall.cpp b/dnf5/commands/reinstall/reinstall.cpp index 7ac214814..f9ba1e54b 100644 --- a/dnf5/commands/reinstall/reinstall.cpp +++ b/dnf5/commands/reinstall/reinstall.cpp @@ -48,7 +48,7 @@ void ReinstallCommand::set_argument_parser() { } return true; }); - keys->set_complete_hook_func([&ctx](const char * arg) { return match_specs(ctx, arg, true, false, true, true); }); + keys->set_complete_hook_func([&ctx](const char * arg) { return match_specs(ctx, arg, true, false, true, false); }); cmd.register_positional_arg(keys); allow_erasing = std::make_unique(*this); diff --git a/dnf5/commands/remove/remove.cpp b/dnf5/commands/remove/remove.cpp index a14669b51..1dd139361 100644 --- a/dnf5/commands/remove/remove.cpp +++ b/dnf5/commands/remove/remove.cpp @@ -55,7 +55,7 @@ void RemoveCommand::set_argument_parser() { } return true; }); - keys->set_complete_hook_func([&ctx](const char * arg) { return match_specs(ctx, arg, true, false, false, true); }); + keys->set_complete_hook_func([&ctx](const char * arg) { return match_specs(ctx, arg, true, false, false, false); }); cmd.register_positional_arg(keys); create_offline_option(*this); diff --git a/dnf5/commands/repoquery/repoquery.cpp b/dnf5/commands/repoquery/repoquery.cpp index fbfc7f200..6b76b9835 100644 --- a/dnf5/commands/repoquery/repoquery.cpp +++ b/dnf5/commands/repoquery/repoquery.cpp @@ -106,7 +106,7 @@ void RepoqueryCommand::set_argument_parser() { }); keys->set_complete_hook_func([this, &ctx](const char * arg) { if (this->installed_option->get_value()) { - return match_specs(ctx, arg, true, false, false, true); + return match_specs(ctx, arg, true, false, false, false); } else { return match_specs(ctx, arg, false, true, true, false); } diff --git a/dnf5/commands/swap/swap.cpp b/dnf5/commands/swap/swap.cpp index c14caa03b..1c54f4b03 100644 --- a/dnf5/commands/swap/swap.cpp +++ b/dnf5/commands/swap/swap.cpp @@ -51,7 +51,7 @@ void SwapCommand::set_argument_parser() { return true; }); remove_spec_arg->set_complete_hook_func( - [&ctx](const char * arg) { return match_specs(ctx, arg, true, false, false, true); }); + [&ctx](const char * arg) { return match_specs(ctx, arg, true, false, false, false); }); cmd.register_positional_arg(remove_spec_arg); auto install_spec_arg = parser.add_new_positional_arg("install_spec", 1, nullptr, nullptr);