From b4c0ac07e859ba9efafceb1bb21d727a5b1d1f1c Mon Sep 17 00:00:00 2001 From: Pavla Kratochvilova Date: Thu, 10 Oct 2024 12:04:13 +0200 Subject: [PATCH] reposync: Respect --norepopath with --metadata-path Resolves: https://issues.redhat.com/browse/RHEL-40914 --- ...espect-norepopath-with-metadata-path.patch | 26 +++++++++++++++++++ dnf-plugins-core.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0019-reposync-Respect-norepopath-with-metadata-path.patch diff --git a/0019-reposync-Respect-norepopath-with-metadata-path.patch b/0019-reposync-Respect-norepopath-with-metadata-path.patch new file mode 100644 index 0000000..0a1281f --- /dev/null +++ b/0019-reposync-Respect-norepopath-with-metadata-path.patch @@ -0,0 +1,26 @@ +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 0282712..aee16eb 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -34,7 +34,7 @@ Name: dnf-plugins-core Version: 4.3.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core @@ -54,6 +54,7 @@ Patch12: 0012-RHEL-6394-Fix-incorrect-spanish-translation-file.patch Patch13: 0013-Fix-for-issue-with-binary-garbage-in-smaps-files.patch Patch14: 0014-needs-restarting-Add-microcode_ctl-to-a-reboot-list.patch Patch18: 0018-system-upgrade-change-http-to-https-in-unit-file.patch +Patch19: 0019-reposync-Respect-norepopath-with-metadata-path.patch BuildArch: noarch BuildRequires: cmake @@ -801,6 +802,9 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ %endif %changelog +* Thu Oct 10 2024 Pavla Kratochvilova - 4.3.0-17 +- reposync: Respect --norepopath with --metadata-path (RHEL-40914) + * Thu Jun 06 2024 Petr Pisar - 4.3.0-16 - Revert needs-restarting prefers to obtain a boot time from systemd to deal with RTCs running in local time (RHEL-39775)