rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Fix Python 3.12 safeConfigParser and invalid escape sequences

Browse Source 
Updates #4968
This commit is contained in:
Chris Johns 2023-11-20 15:12:59 +11:00
parent ae81810adc
commit 63396e2ed6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source-builder/sb/pkgconfig.py
View File

@ -90,7 +90,7 @@ class package(object):
get_recursion = ['cflags', 'libs'] get_recursion = ['cflags', 'libs']
no_dup_flags = ['-I', '-l', '-L'] no_dup_flags = ['-I', '-l', '-L']
dual_opts = ['-D', '-U', '-I', '-l', '-L'] dual_opts = ['-D', '-U', '-I', '-l', '-L']
lib_list_splitter = re.compile('[\s,]+') lib_list_splitter = re.compile(r'[\s,]+')
loaded_prefixes = None loaded_prefixes = None
loaded = {} loaded = {}
@ -514,7 +514,7 @@ class package(object):
return None return None
s = '' s = ''
if self.file_: if self.file_:
mre = re.compile('\$\{[^\}]+\}') mre = re.compile(r'\$\{[^\}]+\}')
s = self.fields[label.lower()] s = self.fields[label.lower()]
expanded = True expanded = True
tm = False tm = False

2
source-builder/sb/version.py
View File

@ -110,7 +110,7 @@ def _load_released_version_config():
import configparser import configparser
except ImportError: except ImportError:
import ConfigParser as configparser import ConfigParser as configparser
v = configparser.SafeConfigParser() v = configparser.ConfigParser()
try: try:
v.read(path.host(ver)) v.read(path.host(ver))
except Exception as e: except Exception as e: