From ad7ceda3d829d7f1114e065cd9dd8eb51bebeffc Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 20 Jun 2024 09:47:47 +0300 Subject: [PATCH] handle tilde in version string Forwarded: yes wafsamba dislikes when version string contains "special" chars. For some of them, upstream already has code to deal with. Add handling of tilde (~) to the same places too. Gbp-Pq: Name tilde-in-version.diff --- buildtools/wafsamba/samba_abi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py index 2d9505d2..cf7153f2 100644 --- a/buildtools/wafsamba/samba_abi.py +++ b/buildtools/wafsamba/samba_abi.py @@ -286,7 +286,7 @@ def abi_build_vscript(task): f.close() def VSCRIPT_MAP_PRIVATE(bld, libname, orig_vscript, version, private_vscript): - version = version.replace("-", "_").replace("+","_").upper() + version = version.replace("-", "_").replace("+","_").replace("~","_").upper() t = bld.SAMBA_GENERATOR(private_vscript, rule=abi_build_vscript, source=orig_vscript, @@ -315,7 +315,7 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None, p libname = os.path.basename(libname) version = os.path.basename(version) libname = libname.replace("-", "_").replace("+","_").upper() - version = version.replace("-", "_").replace("+","_").upper() + version = version.replace("-", "_").replace("+","_").replace("~","_").upper() t = bld.SAMBA_GENERATOR(vscript, rule=abi_build_vscript, -- 2.30.2