diff --git a/0043-history-info-Fix-Persistence-display-for-interval-qu.patch b/0043-history-info-Fix-Persistence-display-for-interval-qu.patch new file mode 100644 index 0000000..4eff584 --- /dev/null +++ b/0043-history-info-Fix-Persistence-display-for-interval-qu.patch @@ -0,0 +1,38 @@ +From 104e0b0f983429c09e8ed3c8644156b019234567 Mon Sep 17 00:00:00 2001 +From: Evan Goode +Date: Mon, 9 Mar 2026 22:23:50 -0400 +Subject: [PATCH] history info: Fix Persistence display for interval queries + +print_persistence() took a persistence parameter but compared against +old.persistence (the property on the transaction object) instead. For +merged transactions, old.persistence returns a list, so comparisons +against scalar enum values always failed, displaying 'Unknown'. + +Use the function parameter instead of old.persistence. + +For: https://github.com/rpm-software-management/libdnf/issues/1744 + +Assisted-by: Claude Opus 4.6 +--- + dnf/cli/output.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dnf/cli/output.py b/dnf/cli/output.py +index 5238b356e..bae870e0b 100644 +--- a/dnf/cli/output.py ++++ b/dnf/cli/output.py +@@ -1778,9 +1778,9 @@ Transaction Summary + print(_("Command Line :"), old.cmdline) + + def print_persistence(persistence): +- if old.persistence == libdnf.transaction.TransactionPersistence_PERSIST: ++ if persistence == libdnf.transaction.TransactionPersistence_PERSIST: + persistence_str = "Persist" +- elif old.persistence == libdnf.transaction.TransactionPersistence_TRANSIENT: ++ elif persistence == libdnf.transaction.TransactionPersistence_TRANSIENT: + persistence_str = "Transient" + else: + persistence_str = "Unknown" +-- +2.53.0 + diff --git a/dnf.spec b/dnf.spec index 893ec8a..2a9d61e 100644 --- a/dnf.spec +++ b/dnf.spec @@ -72,7 +72,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.20.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPL-2.0-or-later AND GPL-1.0-only @@ -120,6 +120,7 @@ Patch39: 0039-autoremove-warn-and-skip-dangling-protected-dependen.patch Patch40: 0040-bootc-unlock-only-if-usr-is-read-only.patch Patch41: 0041-bootc-Call-make_writable-when-DeploymentUnlockedStat.patch Patch42: 0042-Preserve-ACL-when-rotating-logs.patch +Patch43: 0043-history-info-Fix-Persistence-display-for-interval-qu.patch BuildArch: noarch BuildRequires: cmake @@ -481,6 +482,9 @@ popd # bootc subpackage does not include any files %changelog +* Wed Apr 22 2026 Evan Goode - 4.20.0-24 +- history info: Fix Persistence display for interval queries (RHEL-154738) + * Wed Mar 25 2026 Petr Pisar - 4.20.0-23 - Preserve ACL when rotating logs (RHEL-123670)