aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-07-29 10:48:23 -0600
committerEd Santiago <santiago@redhat.com>2020-07-29 10:48:48 -0600
commit382af0978458b7000654284231984dc42edda825 (patch)
treebf04b5d5f9a7827e5ecbf8dbb7e54220dd226baa
parent7f38774ee7758e56cf31e87c81ae0bc9208d0ede (diff)
downloadpodman-382af0978458b7000654284231984dc42edda825.tar.gz
podman-382af0978458b7000654284231984dc42edda825.tar.bz2
podman-382af0978458b7000654284231984dc42edda825.zip
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 <santiago@redhat.com>
-rwxr-xr-xcontrib/cirrus/logformatter6
1 files 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<a class="codelink" href='https://github.com/$3/blob/$git_commit$4#L$5'>$2</a>$6};
}