From 9c0dc12e9bee9322ae1e79d0f70e3611ec5e7d8a Mon Sep 17 00:00:00 2001 From: shirely16 Date: Fri, 16 Apr 2021 09:13:01 +0800 Subject: [PATCH 1/2] return error when dnf download failed (cherry picked from commit 334d7a9eb785df9843f234ac29fda8f091d50f26) --- ...eturn-error-when-dnf-download-failed.patch | 31 +++++++++++++++++++ dnf-plugins-core.spec | 15 +++++++-- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 backport-Return-error-when-dnf-download-failed.patch diff --git a/backport-Return-error-when-dnf-download-failed.patch b/backport-Return-error-when-dnf-download-failed.patch new file mode 100644 index 0000000..0d1a728 --- /dev/null +++ b/backport-Return-error-when-dnf-download-failed.patch @@ -0,0 +1,31 @@ +From 86b479d618c6ec7cace7ba8f0e53e4a05cdb59d9 Mon Sep 17 00:00:00 2001 +From: zhangrui182 <55428730+zhangrui182@users.noreply.github.com> +Date: Wed, 15 Jul 2020 10:41:18 +0800 +Subject: [PATCH] return error when dnf download failed + +fix RhBug:1844925: https://bugzilla.redhat.com/show_bug.cgi?id=1844925 + +Conflict:NA +Reference:https://github.com/rpm-software-management/dnf-plugins-core/commit/86b479d618c6ec7cace7ba8f0e53e4a05cdb59d9 + +--- + plugins/download.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/download.py b/plugins/download.py +index c0fc213d..92a6df4a 100644 +--- a/plugins/download.py ++++ b/plugins/download.py +@@ -259,9 +259,9 @@ def _get_packages_with_deps(self, pkg_specs, source=False): + pkg_set.update(goal.list_upgrades()) + else: + msg = [_('Error in resolve of packages:')] +- logger.warning("\n ".join(msg + [str(pkg) for pkg in pkgs])) +- logger.warning(dnf.util._format_resolve_problems(goal.problem_rules())) +- return [] ++ logger.error("\n ".join(msg + [str(pkg) for pkg in pkgs])) ++ logger.error(dnf.util._format_resolve_problems(goal.problem_rules())) ++ raise dnf.exceptions.Error() + return pkg_set + + @staticmethod diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index ef6991a..f61e89b 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -7,11 +7,14 @@ Name: dnf-plugins-core Version: 4.0.17 -Release: 1 +Release: 2 Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +Patch6000: backport-Return-error-when-dnf-download-failed.patch + BuildArch: noarch BuildRequires: cmake gettext python3-sphinx gdb Requires: python3-%{name} = %{version}-%{release} @@ -148,7 +151,7 @@ on the local filesystem and generating repo metadata. %package_help %prep -%autosetup +%autosetup -p1 mkdir build-py3 %build @@ -314,7 +317,13 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf-local.* %changelog -* Wed Aug 26 2020 yuboyun - 4.0.17-1 +* Fri Apr 16 2021 hanhui - 4.0.17-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:return error when dnf download failed + +* Tue Apr 28 2020 zhouyihang - 4.0.17-1 - Type:requirement - ID:NA - SUG:NA -- Gitee From e096923d9489477ec09ee8baa2a739533ffe4c08 Mon Sep 17 00:00:00 2001 From: shirely Date: Fri, 16 Apr 2021 10:23:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3sync=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dnf-plugins-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index f61e89b..8a5e5bf 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -323,7 +323,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ - SUG:NA - DESC:return error when dnf download failed -* Tue Apr 28 2020 zhouyihang - 4.0.17-1 +* Wed Aug 26 2020 yuboyun - 4.0.17-1 - Type:requirement - ID:NA - SUG:NA -- Gitee