From bfddcfa0b07ffd2a8511d8d68438c9e6250db698 Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Wed, 6 Sep 2023 14:14:49 +0800 Subject: [PATCH] download: skip downloading weak deps when install_weak_deps=False --- ...spect-install_weak_deps-option-value.patch | 30 +++++++++++++++++++ dnf-plugins-core.spec | 9 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 backport-download-plugin-respect-install_weak_deps-option-value.patch diff --git a/backport-download-plugin-respect-install_weak_deps-option-value.patch b/backport-download-plugin-respect-install_weak_deps-option-value.patch new file mode 100644 index 0000000..a8a8ae6 --- /dev/null +++ b/backport-download-plugin-respect-install_weak_deps-option-value.patch @@ -0,0 +1,30 @@ +From 95ff945cd92a8c8299874fe8007951f0d158113a Mon Sep 17 00:00:00 2001 +From: Michal Gawlik +Date: Fri, 16 Sep 2022 13:09:18 +0200 +Subject: [PATCH] download plugin: respect install_weak_deps option value + +Do not download weak deps when install_weak_deps is set to False. + += changelog = +msg: download: skip downloading weak deps when install_weak_deps=False +type: bug + +Reference:https://github.com/rpm-software-management/dnf-plugins-core/commit/95ff945cd92a8c8299874fe8007951f0d158113a +Conflict:NA +--- + plugins/download.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/download.py b/plugins/download.py +index 92a6df4a..d8ce4bec 100644 +--- a/plugins/download.py ++++ b/plugins/download.py +@@ -253,7 +253,7 @@ def _get_packages_with_deps(self, pkg_specs, source=False): + for pkg in pkgs: + goal = hawkey.Goal(self.base.sack) + goal.install(pkg) +- rc = goal.run() ++ rc = goal.run(ignore_weak_deps=(not self.base.conf.install_weak_deps)) + if rc: + pkg_set.update(goal.list_installs()) + pkg_set.update(goal.list_upgrades()) diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 280dc67..437edaf 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -7,13 +7,14 @@ Name: dnf-plugins-core Version: 4.0.24 -Release: 5 +Release: 6 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-fix-error-when-downloading-packages.patch +Patch6001: backport-download-plugin-respect-install_weak_deps-option-value.patch BuildArch: noarch BuildRequires: cmake gettext python3-sphinx @@ -326,6 +327,12 @@ popd %{_mandir}/man8/dnf-local.* %changelog +* Wed Sep 06 2023 sunhai - 4.0.24-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:download: skip downloading weak deps when install_weak_deps=False + * Wed Jul 20 2022 chenhaixing - 4.0.24-5 - Type:bugfix - CVE:NA -- Gitee