From c4a66ff20445673281433ff25ddba2d36c82d621 Mon Sep 17 00:00:00 2001 From: Jaroslav Rohel Date: Wed, 28 Jun 2023 08:55:03 +0200 Subject: [PATCH] Backport patch: "Document symbols in `dnf history list` output" Resolves: rhbz#2172067 --- ...t-symbols-in-dnf-history-list-output.patch | 63 +++++++++++++++++++ dnf.spec | 6 +- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 0044-Document-symbols-in-dnf-history-list-output.patch diff --git a/0044-Document-symbols-in-dnf-history-list-output.patch b/0044-Document-symbols-in-dnf-history-list-output.patch new file mode 100644 index 0000000..9f006d4 --- /dev/null +++ b/0044-Document-symbols-in-dnf-history-list-output.patch @@ -0,0 +1,63 @@ +From a74209ff53c9a51293b45434196dff49002c5691 Mon Sep 17 00:00:00 2001 +From: Evan Goode +Date: Tue, 30 May 2023 20:48:54 +0000 +Subject: [PATCH] Document symbols in `dnf history list` output + +This patch adds documentation for the symbols shown in the "Action(s)" +and "Altered" columns of `dnf history list` + +The "Action(s)" column abbreviates the names of transaction actions when +there was more than one action, e.g. a transaction that both installs +and upgrades packages would be displayed as "I, U". + +The "Altered" column prints some extra symbols when something unusual +happened with the transaction, like if any warnings were printed or if +it completed with a non-zero status. + +Some language was taken from the yum man pages: +https://github.com/rpm-software-management/yum/blob/master/docs/yum.8. +It appears we no longer use the "P" or "s" symbols. + +Resolves https://bugzilla.redhat.com/show_bug.cgi?id=2172067 +(RhBug:2172067) + += changelog = +msg: Document the symbols in the output of `dnf history list` +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2172067 +--- + doc/command_ref.rst | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/doc/command_ref.rst b/doc/command_ref.rst +index 7279b3a4..f8149e86 100644 +--- a/doc/command_ref.rst ++++ b/doc/command_ref.rst +@@ -701,6 +701,24 @@ transactions and act according to this information (assuming the + which specifies a transaction by a package which it manipulated. When no + transaction is specified, list all known transactions. + ++ The "Action(s)" column lists each type of action taken in the transaction. The possible values are: ++ ++ * Install (I): a new package was installed on the system ++ * Downgrade (D): an older version of a package replaced the previously-installed version ++ * Obsolete (O): an obsolete package was replaced by a new package ++ * Upgrade (U): a newer version of the package replaced the previously-installed version ++ * Remove (E): a package was removed from the system ++ * Reinstall (R): a package was reinstalled with the same version ++ * Reason change (C): a package was kept in the system but its reason for being installed changed ++ ++ The "Altered" column lists the number of actions taken in each transaction, possibly followed by one or two the following symbols: ++ ++ * ``>``: The RPM database was changed, outside DNF, after the transaction ++ * ``<``: The RPM database was changed, outside DNF, before the transaction ++ * ``*``: The transaction aborted before completion ++ * ``#``: The transaction completed, but with a non-zero status ++ * ``E``: The transaction completed successfully, but had warning/error output ++ + ``--reverse`` + The order of ``history list`` output is printed in reverse order. + +-- +2.40.1 + diff --git a/dnf.spec b/dnf.spec index 955c678..ce6b095 100644 --- a/dnf.spec +++ b/dnf.spec @@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.7.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ @@ -119,6 +119,7 @@ Patch0040: 0040-Update-translations.patch Patch0041: 0041-Omit-src-RPMs-from-check-update-RhBug-2151910.patch Patch0042: 0042-Backport-automatic-Fix-onl-detect-proxy-RhBz2022440.patch Patch0043: 0043-automatic-Return-an-error-when-transaction-fails-RhB.patch +Patch0044: 0044-Document-symbols-in-dnf-history-list-output.patch BuildArch: noarch @@ -419,6 +420,9 @@ popd %{python3_sitelib}/%{name}/automatic/ %changelog +* Wed Jun 28 2023 Jaroslav Rohel - 4.7.0-19 +- Document symbols in `dnf history list` output (RhBug:2172067) + * Wed May 31 2023 Nicola Sella - 4.7.0-18 - Return an error when transaction fails (RhBug:2170093)