handle tilde in version string
authorMichael Tokarev <mjt@tls.msk.ru>
Thu, 20 Jun 2024 06:47:47 +0000 (09:47 +0300)
committerMichael Tokarev <mjt@tls.msk.ru>
Thu, 20 Jun 2024 06:49:50 +0000 (09:49 +0300)
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

index 2d9505d255c808636a5e3cdc304641686c780d12..cf7153f25f03df8c4ad323ddf8657702aceac966 100644 (file)
@@ -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,