rpms/pyproject-rpm-macros
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Prevent incorrect usage of %pyproject_buildrequires -R with -x/-e/-t

Browse Source 
Fixes: https://bugzilla.redhat.com/2244282
This commit is contained in:
Miro Hrončok 2023-12-11 13:48:52 +01:00
parent 1d00ed8155
commit 89f2408342
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros.pyproject
View File

@ -156,6 +156,9 @@ fi
%{?_package_note_flags:%_generate_package_note_file} %{?_package_note_flags:%_generate_package_note_file}
%{-R: %{-R:
%{-r:%{error:The -R and -r options are mutually exclusive}} %{-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}} %{-w:%{error:The -R and -w options are mutually exclusive}}
} }
%{-N: %{-N:

2
pyproject-rpm-macros.spec
View File

@ -175,6 +175,8 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856
- Add the -l/-L flag to %%pyproject_save_files - 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 can be used to assert at least 1 License-File was detected
- The -L flag explicitly disables this check (which remains the default) - 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 <python-maint@redhat.com> - 1.10.0-1 * Wed Sep 13 2023 Python Maint <python-maint@redhat.com> - 1.10.0-1
- Add %%_pyproject_check_import_allow_no_modules for automated environments - Add %%_pyproject_check_import_allow_no_modules for automated environments