From nobody Fri Feb 02 06:16:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TR5BS2ssJz59X6B; Fri, 2 Feb 2024 06:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TR5BS24R4z4WlF; Fri, 2 Feb 2024 06:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706854576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CAiu5QIIZGml7mqQtHsqGrfyvpG37pHdqR2jL8kDT8=; b=P9AJLt3zSqGZ2In4ThkOsUs0NlS5HDZNbMCJG+VY2/rWNVpgbu2CQTVp3w7t87DTw1z/xt Xk7RnzwvsccBJ9JQZ3RKk3razDxjiR7x/W4YLNGt2nwthq+J9R7kbiGVUJIQC2ePW1PUkk UsVJKYR5l8xUYvc/DOcU/ncrdxuug6iGzQVw01DnaHUhkfY3Xmk0LW3M4+z4hIJPbMrFJi +mE/1j0i8fNpy8RJX64qkzpmEMjvKb3f/+QVqpa91AXOE9FF1rH8DrqRJvPU5rD0RIXaop KVgRM+9yv1MJnGyW9znHV4P+9TR9/fLewHT0Lohy5LxaZWGYyMx9O0Wk35JJEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706854576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CAiu5QIIZGml7mqQtHsqGrfyvpG37pHdqR2jL8kDT8=; b=iPdrj5MJUozZwHLjgZntsm3BI1zuU4o3n+5PmorilKe1K7rR9EhoHGzpGoExeNaiYX7IwG r33BgQ6feXwUdKJv2RFDM6OM84zF4dDhb++jegnpU4i8XFS9qTzek+VTtNOJz6irg6rQ68 TWHu00s6U6DfygbFYK45qcIi1Kxa9ygcPtjGcfnXYb7Z8qRvv9KFqw629eI6vt28PByQfE FyZODnKH0LcmOBZ6kq4GjzqgWCKdZg/PMEyThFPUsbb2txYQGjSkTT8nNT0z+Chm944S1F Z6furWc2lgI/5O8X+pU9m+sLRSJNVxFfYM/ZsFemKWjYcuyJmj8Upn/caGH8JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706854576; a=rsa-sha256; cv=none; b=HKQL2Gthv/ccVDE2vKvBN6JITT73K5JeDvF18buvNYUZGhtdl/wa5WQLMA1cflP/s+ZlYj 6Q5aho8r3AkSuGCrDTTA5DnB44PJ5QAoj81LQvNsUCIyNWARTERyIxyZ7Z6cPT8qUtMHOX FlEZtPKOE65fn7M3lNl+3f60PFmNYiKerr3G7mQc2E8HcdJ7IWeZ4QVXNR3dG7owbnN5Vo Cbc2yXJ6AqpC7+15XGGQxBw3tSMzYJwb5ArQ85lCrx6qC8A6X14Y1QYnr0b/K+Kr/SPl/D LxVEyR89zWKvlXG9qO/F2z5ck0aXAEr0wjlqGdGNqgzUV0UKDLrh29pVwq/B9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TR5BS185SzK9F; Fri, 2 Feb 2024 06:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4126GG2K061308; Fri, 2 Feb 2024 06:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4126GGKl061306; Fri, 2 Feb 2024 06:16:16 GMT (envelope-from git) Date: Fri, 2 Feb 2024 06:16:16 GMT Message-Id: <202402020616.4126GGKl061306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c2f5306c64e7 - main - checkstyle9.pl: Correct github output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2f5306c64e7e44390c6f21179d696bfdea3260b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2f5306c64e7e44390c6f21179d696bfdea3260b commit c2f5306c64e7e44390c6f21179d696bfdea3260b Author: Warner Losh AuthorDate: 2024-02-02 06:15:13 +0000 Commit: Warner Losh CommitDate: 2024-02-02 06:15:13 +0000 checkstyle9.pl: Correct github output Change the : between file and line to a ,. This should fix this... Sponsored by: Netflix --- tools/build/checkstyle9.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index 8fe9b9f94da1..65f13bc1e7f2 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -1175,12 +1175,13 @@ sub report { } my $output = ''; - $output .= BOLD if $color; + my $do_color = $color && !$github; + $output .= BOLD if $do_color; $output .= $prefix; - $output .= RED if $color && $level eq 'ERROR'; - $output .= MAGENTA if $color && $level eq 'WARNING'; - $output .= $level . ':'; - $output .= RESET if $color; + $output .= RED if $do_color && $level eq 'ERROR'; + $output .= MAGENTA if $do_color && $level eq 'WARNING'; + $output .= $level . ':' if !$github; + $output .= RESET if $do_color; $output .= ' ' . $msg . "\n"; $output = (split('\n', $output))[0] . "\n" if ($terse); @@ -1397,8 +1398,8 @@ sub process { #make up the handle for any error we report on this line $prefix = "$filename:$realline: " if ($emacs && $file); $prefix = "$filename:$linenr: " if ($emacs && !$file); - $prefix = "::error file=$filename:line=$realline:\:" if ($github && $file); - $prefix = "::error file=$realfile:line=$linenr:\:" if ($github && !$file); + $prefix = "::error file=$filename,line=$realline:\:" if ($github && $file); + $prefix = "::error file=$realfile,line=$linenr:\:" if ($github && !$file); $here = "#$linenr: " if (!$file); $here = "#$realline: " if ($file);