From e2d4b72609df0864ea2c23534726020bc99384f5 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 12 Jan 2022 15:45:42 -0300 Subject: [PATCH] Improve Dell Phoenix sign-on semantics --- biostools/analyzers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/biostools/analyzers.py b/biostools/analyzers.py index 7b10933..bbcd84f 100644 --- a/biostools/analyzers.py +++ b/biostools/analyzers.py @@ -1960,14 +1960,14 @@ class PhoenixAnalyzer(Analyzer): return True def _signon_dell(self, line, match): - '''^(?:(D)ell System |(?:BIOS Version(?! =)|(?:80[0-9]{2,3}|Phoenix) ROM BIOS PLUS Version (?:[^\s]+)) )(.+)''' + '''^(?:(Dell System )|(?:BIOS Version(?! =)|(?:80[0-9]{2,3}|Phoenix) ROM BIOS PLUS Version (?:[^\s]+)) )(.+)''' # Add model or BIOS version to the sign-on. linebreak_index = self.signon.find('\n') - if match.group(1): # the single captured character is a flag - self.signon = match.group(2) + self.signon[linebreak_index:] + if match.group(1): + self.signon = match.group(1) + match.group(2) + self.signon[linebreak_index:] else: - self.signon = self.signon[:linebreak_index + 1] + 'BIOS Version: ' + match.group(2)[:3] + self.signon = self.signon[:linebreak_index + 1] + 'BIOS version ' + match.group(2)[:3] return True