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

Revert the temporary workaround for RPM 4.20 alpha 2 leaking \x1f (unit separators)

Browse Source 
This reverts commit 996ac31b46.
This commit is contained in:
Miro Hrončok 2024-07-03 15:59:15 +02:00
parent 6d455af4dc
commit 436695615e
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyproject-rpm-macros.spec
View File

@ -80,7 +80,8 @@ Requires: /usr/bin/sed
# This package requires the %%generate_buildrequires functionality. # This package requires the %%generate_buildrequires functionality.
# It has been introduced in RPM 4.15 (4.14.90 is the alpha of 4.15). # It has been introduced in RPM 4.15 (4.14.90 is the alpha of 4.15).
# What we need is rpmlib(DynamicBuildRequires), but that is impossible to (Build)Require. # What we need is rpmlib(DynamicBuildRequires), but that is impossible to (Build)Require.
Requires: (rpm-build >= 4.14.90 if rpm-build) # Also, we need to avoid 4.19.90..4.19.91-7 due to rhbz#2284187
Requires: ((rpm-build >= 4.14.90 with (rpm-build < 4.19.90 or rpm-build >= 4.19.91-8)) if rpm-build)
BuildRequires: rpm-build >= 4.14.90 BuildRequires: rpm-build >= 4.14.90
%description %description
@ -173,6 +174,7 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856
%changelog %changelog
* Tue Jul 02 2024 Miro Hrončok <mhroncok@redhat.com> - 1.13.0-1 * Tue Jul 02 2024 Miro Hrončok <mhroncok@redhat.com> - 1.13.0-1
- Properly escape weird characters from paths in %%{pyproject_files} (RPM 4.19+ only) - Properly escape weird characters from paths in %%{pyproject_files} (RPM 4.19+ only)
- Revert the temporary workaround for RPM 4.20 alpha 2 leaking \x1f (unit separators)
- Fixes: rhbz#1990879 - Fixes: rhbz#1990879
* Tue Jun 25 2024 Cristian Le <fedora@lecris.me> - 1.12.2-1 * Tue Jun 25 2024 Cristian Le <fedora@lecris.me> - 1.12.2-1

10
pyproject_construct_toxenv.py
View File

@ -11,13 +11,5 @@ def main(argv):
return ','.join(args.toxenv) return ','.join(args.toxenv)
def strip_x1f(argv):
r"""
Hack workaround for RPM 4.20 alpha 2 leaking \x1f (unit separators).
https://bugzilla.redhat.com/2284187
"""
return [a.strip('\x1f') for a in argv]
if __name__ == '__main__': if __name__ == '__main__':
print(main(strip_x1f(sys.argv[1:]))) print(main(sys.argv[1:]))