From 5152dfa764c2397047761dcce7835c615a819853 Mon Sep 17 00:00:00 2001 From: Stepan Oksanichenko Date: Fri, 27 Sep 2024 15:43:27 +0300 Subject: [PATCH] - Add x86_64_v2 to a lisf of exclusive arches if there is any arch with base `x86_64` - Changelog - Bumbed version --- pungi.spec | 5 ++++- pungi/arch.py | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pungi.spec b/pungi.spec index 9f63dae8..744cad04 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,7 +2,7 @@ Name: pungi Version: 4.7.0 -Release: 5%{?dist}.alma +Release: 6%{?dist}.alma Summary: Distribution compose tool License: GPL-2.0-only @@ -174,6 +174,9 @@ rm %{buildroot}%{_bindir}/pungi %{_bindir}/%{name}-cache-cleanup %changelog +* Fri Sep 27 2024 Stepan Oksanichenko - 4.7.0-6 +- Add x86_64_v2 to a lisf of exclusive arches if there is any arch with base `x86_64` + * Mon Sep 16 2024 Eduard Abdullin - 4.7.0-5 - Add x86_64_v2 to arch list if x86_64 in list diff --git a/pungi/arch.py b/pungi/arch.py index 3a927966..779bf757 100644 --- a/pungi/arch.py +++ b/pungi/arch.py @@ -93,7 +93,9 @@ def split_name_arch(name_arch): def is_excluded(package, arches, logger=None): """Check if package is excluded from given architectures.""" - if package.arch == 'x86_64_v2' and 'x86_64' in package.exclusivearch: + if any( + getBaseArch(exc_arch) == 'x86_64' for exc_arch in package.exclusivearch + ) and 'x86_64_v2' not in package.exclusivearch: package.exclusivearch.append('x86_64_v2') if package.excludearch and set(package.excludearch) & set(arches):