From 8a11bfe68c3eaa65ed58b164cb8027d2fb4da27b Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Thu, 21 Nov 2024 15:37:54 +0800 Subject: [PATCH] reposync: Respect --norepopath with --metadata-path --- ...espect-norepopath-with-metadata-path.patch | 25 +++++++++++++++++++ dnf-plugins-core.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 backport-reposync-Respect-norepopath-with-metadata-path.patch diff --git a/backport-reposync-Respect-norepopath-with-metadata-path.patch b/backport-reposync-Respect-norepopath-with-metadata-path.patch new file mode 100644 index 0000000..0dafcc5 --- /dev/null +++ b/backport-reposync-Respect-norepopath-with-metadata-path.patch @@ -0,0 +1,25 @@ +From 1177f339dc3c428d57aef9ec6ae5d1db09ff7b95 Mon Sep 17 00:00:00 2001 +From: Pavla Kratochvilova +Date: Wed, 24 Jul 2024 11:05:18 +0200 +Subject: [PATCH] reposync: Respect --norepopath with --metadata-path + +Resolves: https://issues.redhat.com/browse/RHEL-40914 +--- + plugins/reposync.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/reposync.py b/plugins/reposync.py +index 0ff936f..ab513e7 100644 +--- a/plugins/reposync.py ++++ b/plugins/reposync.py +@@ -180,7 +180,7 @@ class RepoSyncCommand(dnf.cli.Command): + + def metadata_target(self, repo): + if self.opts.metadata_path: +- return _pkgdir(self.opts.metadata_path, repo.id) ++ return _pkgdir(self.opts.metadata_path, repo.id if not self.opts.norepopath else '') + else: + return self.repo_target(repo) + +-- +2.46.2 diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index d23e515..1c98528 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -9,13 +9,14 @@ Name: dnf-plugins-core Version: 4.3.1 -Release: 5 +Release: 6 Summary: Core Plugins for DNF License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/dnf-plugins-core Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz patch6000: backport-download-plugin-respect-install_weak_deps-option-value.patch +patch6001: backport-reposync-Respect-norepopath-with-metadata-path.patch patch9000: 9000-Replace-COPR-hub-with-openeuler.patch @@ -342,6 +343,12 @@ ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz %{_mandir}/man8/dnf-local.* %changelog +* Thu Nov 07 2024 yueyuankun - 4.3.1-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:reposync: Respect --norepopath with --metadata-path + * Thu Nov 07 2024 Funda Wang - 4.3.1-5 - adopt to new cmake macro - force out-of-source build per requested by doc-man generation -- Gitee