From a14c568f26b93bbcef3672ad99739bcbff496a59 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Wed, 20 Nov 2019 12:17:24 -0600 Subject: [PATCH] run: use 0 for undefined versioned components Fix the version parser to use 0 for undefined version components instead of None to support looser version specifications: 5 => 5.0.0 5.1 => 5.1.0 5.1.1 => 5.1.1 --- run.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/run.py b/run.py index 111b4bc4d..6d5043c76 100755 --- a/run.py +++ b/run.py @@ -93,20 +93,9 @@ SuricataVersion = namedtuple( def parse_suricata_version(buf): m = re.search("(\d+)\.?(\d+)?\.?(\d+)?.*", str(buf).strip()) if m: - if m.group(1) is not None: - major = int(m.group(1)) - else: - major = None - - if m.group(2) is not None: - minor = int(m.group(2)) - else: - minor = None - - if m.group(3) is not None: - patch = int(m.group(3)) - else: - patch = None + major = int(m.group(1)) if m.group(1) else 0 + minor = int(m.group(2)) if m.group(2) else 0 + patch = int(m.group(3)) if m.group(3) else 0 return SuricataVersion( major=major, minor=minor, patch=patch) -- 2.47.2