about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPiotr Wójcik <chocimier@tlen.pl>2024-03-02 20:30:09 +0100
committerLeah Neukirchen <leah@vuxu.org>2024-03-04 14:36:19 +0100
commit7adbc887d6697c9795d16d73650bee32ce827745 (patch)
tree1e766cea242bba234c0901bb2d8c3bfd63ab03be
parentee7c68cef40403cf654ecf4a8c55a348be28fd90 (diff)
downloadxtools-7adbc887d6697c9795d16d73650bee32ce827745.tar.gz
xtools-7adbc887d6697c9795d16d73650bee32ce827745.tar.xz
xtools-7adbc887d6697c9795d16d73650bee32ce827745.zip
xlint: actually check ${version} in distfiles
\Q...\E already handles special characters

partially reverts 2e0da76fef5f6659e0e98d7166e4497d23565831

Closes: #324 [via git-merge-pr]
-rwxr-xr-xxlint3
1 files changed, 1 insertions, 2 deletions
diff --git a/xlint b/xlint
index 0b1ea22..d9b4b85 100755
--- a/xlint
+++ b/xlint
@@ -484,8 +484,7 @@ for argument; do
 	pkgname=$(grep -Po "^pkgname=\K.*" "$template" | once)
 	pkgname_re=$(echo "$pkgname" | regex_escape)
 	version=$(grep -Po "^version=\K.*" "$template" | once)
-	version_re=$(echo "$version" | regex_escape)
-	scan "distfiles=.*\Q$version_re\E" 'use ${version} in distfiles instead'
+	scan "distfiles=.*\Q$version\E" 'use ${version} in distfiles instead'
 	scan "system_accounts=.*\b(?!($old_accounts))[a-zA-Z]" 'new accounts should be prefixed with underscore'
 	scan "cargo update (--package|-p) [A-Za-z_][A-Za-z0-9_]*(?!\:[0-9]+\.[0-9]+\.[0-9]+)(\s.+)?$" '"cargo update" commands should include the specific version we are updating from in the --package SPEC' 
 	scan "cargo update (--package|-p) [A-Za-z_][A-Za-z0-9_-]*\:[0-9]+\.[0-9]+\.[0-9]+(?!--precise [0-9]+\.[0-9]+\.[0-9]+)$" '"cargo update" commands should include the specific version we are updating to, using --precise'