Re: [PR PATCH] [Updated] support severity levels in xlint

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages sev0
https://github.com/void-linux/void-packages/pull/48680

support severity levels in xlint
see https://github.com/leahneukirchen/xtools/pull/323

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**



A patch file from https://github.com/void-linux/void-packages/pull/48680.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sev0-48680.patch --]
[-- Type: text/x-diff, Size: 4651 bytes --]

From 4ff1feb681b8f20c773b5688d4e8afad2e49ded1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Feb 2024 17:48:41 -0500
Subject: [PATCH 1/5] common/scripts/lint2annotations.awk: support severity in
 xlint

---
 common/scripts/lint2annotations.awk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/scripts/lint2annotations.awk b/common/scripts/lint2annotations.awk
index 5405d69715359b..3f92046fc3b23e 100644
--- a/common/scripts/lint2annotations.awk
+++ b/common/scripts/lint2annotations.awk
@@ -4,8 +4,12 @@
 	split($0, a, ": ")
 	split(a[1], b, ":")
 	msg = substr($0, index($0, ": ") + 2)
-	if (b[2]) {
+	severity = "error"
+	if (b[3]) {
+		line = ",line=" b[3]
+		severity = b[2]
+	} else if (b[2]) {
 		line = ",line=" b[2]
 	}
-	printf "::error title=Template Lint,file=%s%s::%s\n", b[1], line, msg
+	printf "::%s title=Template Lint,file=%s%s::%s\n", severity, b[1], line, msg
 }

From 312e001f008cde063f99e3ab5122779947d7bb96 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Feb 2024 17:50:50 -0500
Subject: [PATCH 2/5] common/travis/xlint.sh: support xlint severity levels

---
 common/travis/xlint.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh
index 0b2d12d0b0d041..722982416a756f 100755
--- a/common/travis/xlint.sh
+++ b/common/travis/xlint.sh
@@ -10,6 +10,8 @@ common/scripts/lint-commits $base $tip || EXITCODE=$?
 for t in $(awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates); do
 	/bin/echo -e "\x1b[32mLinting $t...\x1b[0m"
 	xlint "$t" > /tmp/xlint_out || EXITCODE=$?
+	# if there are only warnings, don't consider it a fail
+	grep -q error /tmp/xlint_out || EXITCODE=0
 	common/scripts/lint-version-change "$t" $base $tip > /tmp/vlint_out || EXITCODE=$?
 	awk -f common/scripts/lint2annotations.awk /tmp/xlint_out /tmp/vlint_out
 done

From 6433519e836919d3f2f49b55eafb2be097dc4797 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Feb 2024 17:53:30 -0500
Subject: [PATCH 3/5] temp

---
 srcpkgs/chezmoi/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 1b5d674c14ab9b..882ce4b62b4028 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.46.0
-revision=1
+version=2.46.1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
@@ -13,7 +13,9 @@ license="MIT"
 homepage="https://chezmoi.io/"
 changelog="https://github.com/twpayne/chezmoi/releases"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=36cee8fc5579a155d4f5402f353e4b4099f92ec2b98982a4ccff4ab35f4d0348
+checksum=5b6b908da4a374d9fcad07b1f5002e50f3d5a8fdda2eb5f471befdcf365f67e4
+_foo_bar=
+long_desc=asdfhasdfa
 
 pre_build() {
 	local _date

From 3e48b9f8901ebbc415128b06c5aea7da1f5363c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Feb 2024 17:58:28 -0500
Subject: [PATCH 4/5] temp

---
 common/travis/fetch-xtools.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/travis/fetch-xtools.sh b/common/travis/fetch-xtools.sh
index 0dd9e6c532c06c..fa4c6ffa5a4a40 100755
--- a/common/travis/fetch-xtools.sh
+++ b/common/travis/fetch-xtools.sh
@@ -4,7 +4,7 @@
 
 TAR=tar
 command -v bsdtar >/dev/null && TAR=bsdtar
-URL="https://github.com/leahneukirchen/xtools/archive/master.tar.gz"
+URL="https://github.com/classabbyamp/xtools/archive/sev0.tar.gz"
 FILE="xtools.tar.gz"
 
 mkdir -p /tmp/bin

From 8fc5c0de2caf7418b0f58eabc7522f2fa22aee95 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Feb 2024 18:01:05 -0500
Subject: [PATCH 5/5] fixup! temp

---
 srcpkgs/chezmoi/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 882ce4b62b4028..055cdb49c85e91 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.46.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
@@ -15,7 +15,6 @@ changelog="https://github.com/twpayne/chezmoi/releases"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
 checksum=5b6b908da4a374d9fcad07b1f5002e50f3d5a8fdda2eb5f471befdcf365f67e4
 _foo_bar=
-long_desc=asdfhasdfa
 
 pre_build() {
 	local _date