Revert "advisory: add running kernel before pkg_specs filtering"

This reverts commit f1283c9.

Because running kernel packages were added to newly created
package_query, which already contained all packages (so resulted in
no-op).
Running kernels need to be added after filtering the latest installed
versions but before applying --contains-pkgs option.

dnf5/commands/advisory/advisory_info.cpp

@@ -46,6 +46,8 @@ void AdvisoryInfoCommand::process_and_print_queries(
  packages.filter_installed();
  packages.filter_latest_evr();
 
+ add_running_kernel_packages(ctx.base, packages);
+
  advisories.filter_packages(packages, libdnf5::sack::QueryCmp::GT);
  }
 

dnf5/commands/advisory/advisory_list.cpp

@@ -28,9 +28,7 @@ namespace dnf5 {
 using namespace libdnf5::cli;
 
 void AdvisoryListCommand::process_and_print_queries(
- [[maybe_unused]] Context & ctx,
- libdnf5::advisory::AdvisoryQuery & advisories,
- libdnf5::rpm::PackageQuery & packages) {
+ Context & ctx, libdnf5::advisory::AdvisoryQuery & advisories, libdnf5::rpm::PackageQuery & packages) {
  std::vector<libdnf5::advisory::AdvisoryPackage> installed_pkgs;
  std::vector<libdnf5::advisory::AdvisoryPackage> not_installed_pkgs;
 
@@ -50,6 +48,8 @@ void AdvisoryListCommand::process_and_print_queries(
  packages.filter_installed();
  packages.filter_latest_evr();
 
+ add_running_kernel_packages(ctx.base, packages);
+
  not_installed_pkgs = advisories.get_advisory_packages_sorted(packages, libdnf5::sack::QueryCmp::GT);
  }
 

dnf5/commands/advisory/advisory_subcommand.cpp

@@ -60,7 +60,7 @@ void AdvisorySubCommand::set_argument_parser() {
 // When the running kernel has available advisories show them because the system
 // is vulnerable (even if the newer fixed version of kernel is already installed).
 // DNF4 bug with behavior description: https://bugzilla.redhat.com/show_bug.cgi?id=1728004
-static void add_running_kernel_packages(libdnf5::Base & base, libdnf5::rpm::PackageQuery & package_query) {
+void AdvisorySubCommand::add_running_kernel_packages(libdnf5::Base & base, libdnf5::rpm::PackageQuery & package_query) {
  auto kernel = base.get_rpm_package_sack()->get_running_kernel();
  if (kernel.get_id().id > 0) {
  libdnf5::rpm::PackageQuery kernel_query(base);
@@ -82,13 +82,6 @@ void AdvisorySubCommand::run() {
  auto & ctx = get_context();
 
  libdnf5::rpm::PackageQuery package_query(ctx.base);
-
- // When running with the default filter (available)
- if (!all->get_value() && !installed->get_value() && !updates->get_value()) {
- add_running_kernel_packages(ctx.base, package_query);
- }
-
-
  auto package_specs_strs = contains_pkgs->get_value();
  // Filter packages by name patterns if given
  if (package_specs_strs.size() > 0) {

dnf5/commands/advisory/advisory_subcommand.hpp

@@ -40,6 +40,8 @@ class AdvisorySubCommand : public Command {
  virtual void process_and_print_queries(
  Context & ctx, libdnf5::advisory::AdvisoryQuery & advisories, libdnf5::rpm::PackageQuery & packages) = 0;
 
+ void add_running_kernel_packages(libdnf5::Base & base, libdnf5::rpm::PackageQuery & package_query);
+
  std::unique_ptr<AdvisoryAvailableOption> available{nullptr};
  std::unique_ptr<AdvisoryInstalledOption> installed{nullptr};
  std::unique_ptr<AdvisoryAllOption> all{nullptr};

dnf5/commands/advisory/advisory_summary.cpp

@@ -49,6 +49,8 @@ void AdvisorySummaryCommand::process_and_print_queries(
  packages.filter_installed();
  packages.filter_latest_evr();
 
+ add_running_kernel_packages(ctx.base, packages);
+
  advisories.filter_packages(packages, libdnf5::sack::QueryCmp::GT);
  mode = _("Available");
  }