Fix 'dnf copr enable' on Fedora 35

This commit is contained in:
Pavla Kratochvilova 2021-07-23 08:01:44 +02:00
parent ef08c524d6
commit 6ef144a98a
2 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,28 @@
From 841b00af5c87b4ee7b8eb79152ec8cacf7e54c00 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 16 Jul 2021 12:52:03 +0200
Subject: [PATCH] Fix 'dnf copr enable' on Fedora 35
The output from linux_distribution() changed so it returns:
>>> distro.linux_distribution()
('Fedora Linux', '35', '')
---
plugins/copr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/copr.py b/plugins/copr.py
index 4644495..5cf17ef 100644
--- a/plugins/copr.py
+++ b/plugins/copr.py
@@ -431,7 +431,7 @@ Bugzilla. In case of problems, contact the owner of this repository.
dist = linux_distribution()
# Get distribution architecture
distarch = self.base.conf.substitutions['basearch']
- if "Fedora" in dist:
+ if any([name in dist for name in ["Fedora", "Fedora Linux"]]):
if "Rawhide" in dist:
chroot = ("fedora-rawhide-" + distarch)
# workaround for enabling repos in Rawhide when VERSION in os-release
--
libgit2 1.0.1

View File

@ -34,11 +34,13 @@
Name: dnf-plugins-core
Version: 4.0.22
Release: 2%{?dist}
Release: 3%{?dist}
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
Patch1: 0001-Fix-dnf-copr-enable-on-Fedora-35.patch
BuildArch: noarch
BuildRequires: cmake
BuildRequires: gettext
@ -403,7 +405,7 @@ updated by newer versions.
%endif
%prep
%autosetup
%autosetup -p1
%if %{with python2}
mkdir build-py2
%endif
@ -763,6 +765,9 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
%endif
%changelog
* Fri Jul 23 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 4.0.22-3
- Fix 'dnf copr enable' on Fedora 35
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild