From 7adbc887d6697c9795d16d73650bee32ce827745 Mon Sep 17 00:00:00 2001 From: Piotr Wójcik Date: Sat, 2 Mar 2024 20:30:09 +0100 Subject: xlint: actually check ${version} in distfiles \Q...\E already handles special characters partially reverts 2e0da76fef5f6659e0e98d7166e4497d23565831 Closes: #324 [via git-merge-pr] --- xlint | 3 +-- 1 file changed, 1 insertion(+), 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' -- cgit 1.4.1