From 366f783105f16bd6f010b0747a2bb3429f7602b1 Mon Sep 17 00:00:00 2001 From: ut003460 Date: Tue, 11 Jul 2023 15:34:01 +0800 Subject: [PATCH] update --- avocado/utils/cpu.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/avocado/utils/cpu.py b/avocado/utils/cpu.py index 4a24d35144..75f79afa7b 100644 --- a/avocado/utils/cpu.py +++ b/avocado/utils/cpu.py @@ -132,17 +132,21 @@ def get_version(): "powerpc": rb"revision\s+:\s+(\S+)", "s390": rb".*machine\s=\s(\d+)", } + cpu_info = _get_info() arch = get_arch() - try: - version_pattern[arch] - except KeyError as Err: - LOG.warning("No pattern string for arch: %s\n Error: %s", arch, Err) - return None + + pattern = version_pattern.get(arch) + + if not pattern: + LOG.warning("No pattern string for arch: %s", arch) + return "" + for line in cpu_info: - version_out = re.findall(version_pattern[arch], line) + version_out = re.findall(pattern, line) if version_out: return version_out[0].decode("utf-8") + return ""