From c70862c202b3738c062c7080e827dcdd55c94199 Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Tue, 2 Apr 2019 13:40:39 -0700 Subject: [PATCH] More carefully ignore line numbers/time stamps. (#365) This helps when there are other kinds of text in the same file as the openocd log. Change-Id: I38da7d6685769a323930d6aab6cd83b7f27ea90f --- tools/filter_openocd_log.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/filter_openocd_log.py b/tools/filter_openocd_log.py index b7ae6e0e8..da17b173b 100755 --- a/tools/filter_openocd_log.py +++ b/tools/filter_openocd_log.py @@ -1,13 +1,14 @@ #!/usr/bin/env python import sys +import re # This function is the only OpenOCD-specific part of this script. def make_canonical(line): # Remove the line number and time stamp. - parts = line.split(None, 3) - if len(parts) > 3: - return "%s - - %s" % (parts[0], parts[3]) + m = re.match(r"(Debug|Error|Info |User |Warn ): \d+ \d+ (.*)", line) + if m: + return "%s: - - %s\n" % (m.group(1), m.group(2)) else: return line