From b5c55d61674f77a17ba5ad57f7555e5fe21ec5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 11 Dec 2023 13:48:52 +0100 Subject: [PATCH] Prevent incorrect usage of %pyproject_buildrequires -R with -x/-e/-t Fixes: https://bugzilla.redhat.com/2244282 --- macros.pyproject | 3 +++ pyproject-rpm-macros.spec | 2 ++ 2 files changed, 5 insertions(+) diff --git a/macros.pyproject b/macros.pyproject index 81c7f29..f173869 100644 --- a/macros.pyproject +++ b/macros.pyproject @@ -156,6 +156,9 @@ fi %{?_package_note_flags:%_generate_package_note_file} %{-R: %{-r:%{error:The -R and -r options are mutually exclusive}} +%{-x:%{error:The -R and -x options are mutually exclusive}} +%{-e:%{error:The -R and -e options are mutually exclusive}} +%{-t:%{error:The -R and -t options are mutually exclusive}} %{-w:%{error:The -R and -w options are mutually exclusive}} } %{-N: diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec index 2ea76f0..f177f6a 100644 --- a/pyproject-rpm-macros.spec +++ b/pyproject-rpm-macros.spec @@ -187,6 +187,8 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 - Add the -l/-L flag to %%pyproject_save_files - The -l flag can be used to assert at least 1 License-File was detected - The -L flag explicitly disables this check (which remains the default) +- Prevent incorrect usage of %%pyproject_buildrequires -R with -x/-e/-t +- Fixes: rhbz#2244282 * Wed Sep 13 2023 Python Maint - 1.10.0-1 - Add %%_pyproject_check_import_allow_no_modules for automated environments