Commit e1dba290 by Alexander Popov

Precise the regular expressions in detect_arch() and detect_kernel_version()

And fix the wording in the error message by the way.
parent 320ab961
...@@ -31,7 +31,7 @@ def _open(file: str, *args, **kwargs): ...@@ -31,7 +31,7 @@ def _open(file: str, *args, **kwargs):
def detect_arch(fname, archs): def detect_arch(fname, archs):
with _open(fname, 'rt', encoding='utf-8') as f: with _open(fname, 'rt', encoding='utf-8') as f:
arch_pattern = re.compile("CONFIG_[a-zA-Z0-9_]*=y") arch_pattern = re.compile("CONFIG_[a-zA-Z0-9_]+=y$")
arch = None arch = None
for line in f.readlines(): for line in f.readlines():
if arch_pattern.match(line): if arch_pattern.match(line):
...@@ -40,7 +40,7 @@ def detect_arch(fname, archs): ...@@ -40,7 +40,7 @@ def detect_arch(fname, archs):
if arch is None: if arch is None:
arch = option arch = option
else: else:
return None, 'more than one supported microarchitecture is detected' return None, 'detected more than one microarchitecture'
if arch is None: if arch is None:
return None, 'failed to detect microarchitecture' return None, 'failed to detect microarchitecture'
return arch, 'OK' return arch, 'OK'
...@@ -48,7 +48,7 @@ def detect_arch(fname, archs): ...@@ -48,7 +48,7 @@ def detect_arch(fname, archs):
def detect_kernel_version(fname): def detect_kernel_version(fname):
with _open(fname, 'rt', encoding='utf-8') as f: with _open(fname, 'rt', encoding='utf-8') as f:
ver_pattern = re.compile("# Linux/.* Kernel Configuration") ver_pattern = re.compile("# Linux/.+ Kernel Configuration$")
for line in f.readlines(): for line in f.readlines():
if ver_pattern.match(line): if ver_pattern.match(line):
line = line.strip() line = line.strip()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment