Fix reporting nothing-to-do for "dnf remove --duplicates"

Resolves: RHEL-6424
This commit is contained in:
Petr Písař 2024-05-21 15:22:34 +02:00
parent 881a57426b
commit 71727f7150
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,38 @@
From c24e1521813dc002994f243c2b9de331b763b434 Mon Sep 17 00:00:00 2001
From: Pavla Kratochvilova <pkratoch@redhat.com>
Date: Fri, 5 Apr 2024 14:42:38 +0200
Subject: [PATCH 1/2] remove --duplicates: when no duplicates, exit with 0
(RHEL-6424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: 720338fed8124b120b56cc99cc0b13dfe48ffe95
If no duplicates are present, then the command succesfully removed all
duplicates and should exit with 0 and write the message to stdout
instead of stderr.
Resolves: https://issues.redhat.com/browse/RHEL-6424
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dnf/cli/commands/remove.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dnf/cli/commands/remove.py b/dnf/cli/commands/remove.py
index e455ba6e..af9622fd 100644
--- a/dnf/cli/commands/remove.py
+++ b/dnf/cli/commands/remove.py
@@ -92,7 +92,8 @@ class RemoveCommand(commands.Command):
instonly = self.base._get_installonly_query(q.installed())
dups = q.duplicated().difference(instonly)
if not dups:
- raise dnf.exceptions.Error(_('No duplicated packages found for removal.'))
+ logger.info(_('No duplicated packages found for removal.'))
+ return
for (name, arch), pkgs_list in dups._na_dict().items():
if len(pkgs_list) < 2:
--
2.45.0

View File

@ -69,7 +69,7 @@ It supports RPMs, modules and comps groups & environments.
Name: dnf
Version: 4.14.0
Release: 11%{?dist}
Release: 12%{?dist}
Summary: %{pkg_summary}
# For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPLv2+
@ -95,6 +95,7 @@ Patch17: 0017-Remove-confusing-sentence-from-documentation.patch
Patch18: 0018-Remove-leaf-word-from-documentation.patch
Patch19: 0019-Update-documentation-of-history-userinstalled-comman.patch
Patch20: 0020-automatic-Use-add_security_filters-not-_update_secur.patch
Patch21: 0021-remove-duplicates-when-no-duplicates-exit-with-0-RHE.patch
BuildArch: noarch
BuildRequires: cmake
@ -383,6 +384,9 @@ popd
%{python3_sitelib}/%{name}/automatic/
%changelog
* Tue May 21 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-12
- Fix reporting nothing-to-do for "dnf remove --duplicates" (RHEL-6424)
* Mon May 06 2024 Petr Pisar <ppisar@redhat.com> - 4.14.0-11
- Fix handling an installation reason of install-only packages on autoremove
(RHEL-15902)