From 436695615ed46c3244f17b8427d2e1e0778764b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 3 Jul 2024 15:59:15 +0200 Subject: [PATCH] Revert the temporary workaround for RPM 4.20 alpha 2 leaking \x1f (unit separators) This reverts commit 996ac31b46e194e25fa7ddc8d9c15254f306c363. --- pyproject-rpm-macros.spec | 4 +++- pyproject_construct_toxenv.py | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec index b168e3a..fbd4545 100644 --- a/pyproject-rpm-macros.spec +++ b/pyproject-rpm-macros.spec @@ -80,7 +80,8 @@ Requires: /usr/bin/sed # This package requires the %%generate_buildrequires functionality. # 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. -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 %description @@ -173,6 +174,7 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %changelog * Tue Jul 02 2024 Miro Hrončok - 1.13.0-1 - 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 * Tue Jun 25 2024 Cristian Le - 1.12.2-1 diff --git a/pyproject_construct_toxenv.py b/pyproject_construct_toxenv.py index 2d148f8..a2a5f96 100644 --- a/pyproject_construct_toxenv.py +++ b/pyproject_construct_toxenv.py @@ -11,13 +11,5 @@ def main(argv): 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__': - print(main(strip_x1f(sys.argv[1:]))) + print(main(sys.argv[1:]))