opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 13:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

logformatter: more libpod-podman fallout

Browse Source 
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 <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2020-07-29 10:48:23 -06:00
parent 7f38774ee7
commit 382af09784
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/cirrus/logformatter
View File

@ -208,13 +208,13 @@ END_HTML
} }
# Try to identify the git commit we're working with... # 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; $git_commit = $1;
} }
# ...so we can link to specific lines in source files # ...so we can link to specific lines in source files
if ($git_commit) { if ($git_commit) {
# 1 12 3 34 4 5 526 6 # 1 12 3 34 4 5 526 6
$line =~ s{^(.*)(\/(containers\/libpod)(\/\S+):(\d+))(.*)$} $line =~ s{^(.*)(\/(containers\/[^/]+)(\/\S+):(\d+))(.*)$}
{$1<a class="codelink" href='https://github.com/$3/blob/$git_commit$4#L$5'>$2</a>$6}; {$1<a class="codelink" href='https://github.com/$3/blob/$git_commit$4#L$5'>$2</a>$6};
} }