From 382af0978458b7000654284231984dc42edda825 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 29 Jul 2020 10:48:23 -0600 Subject: logformatter: more libpod-podman fallout Problem: formatted logs no longer have live links to sources in error-report lines. Cause: script was searching for '/libpod'. Solution: make it more flexible. Signed-off-by: Ed Santiago --- contrib/cirrus/logformatter | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter index b56a829c5..f97638b6f 100755 --- a/contrib/cirrus/logformatter +++ b/contrib/cirrus/logformatter @@ -208,13 +208,13 @@ END_HTML } # Try to identify the git commit we're working with... - if ($line =~ m!libpod/define.gitCommit=([0-9a-f]+)!) { + if ($line =~ m!/define.gitCommit=([0-9a-f]+)!) { $git_commit = $1; } # ...so we can link to specific lines in source files if ($git_commit) { - # 1 12 3 34 4 5 526 6 - $line =~ s{^(.*)(\/(containers\/libpod)(\/\S+):(\d+))(.*)$} + # 1 12 3 34 4 5 526 6 + $line =~ s{^(.*)(\/(containers\/[^/]+)(\/\S+):(\d+))(.*)$} {$1$2$6}; } -- cgit v1.2.3-54-g00ecf