about summary refs log tree commit diff
diff options
context:
space:
mode:
authorclassabbyamp <void@placeviolette.net>2022-10-23 02:01:22 -0400
committerLeah Neukirchen <leah@vuxu.org>2022-11-08 22:13:32 +0100
commitaffabbf14cdda08baa15e1c2848a9d04ea7a83c8 (patch)
treed89144e2a4d1edbc7feb05b8771e28fd9b70f1f1
parent68301a30c1703b12f3294120910c8d4734d29bc6 (diff)
downloadxtools-affabbf14cdda08baa15e1c2848a9d04ea7a83c8.tar.gz
xtools-affabbf14cdda08baa15e1c2848a9d04ea7a83c8.tar.xz
xtools-affabbf14cdda08baa15e1c2848a9d04ea7a83c8.zip
xlint: don't allow wrksrc
for void-linux/void-packages#40122
-rwxr-xr-xxlint5
1 files changed, 1 insertions, 4 deletions
diff --git a/xlint b/xlint
index 61d5e9d..5c8e8e4 100755
--- a/xlint
+++ b/xlint
@@ -60,7 +60,6 @@ variables_order() {
 			version=*) curr_index=3;;
 			revision=*) curr_index=4;;
 			archs=*) curr_index=5;;
-			wrksrc=*) curr_index=7;;
 			create_wrksrc=*) curr_index=8;;
 			build_wrksrc=*) curr_index=9;;
 			build_style=*) curr_index=11;;
@@ -269,7 +268,6 @@ system_groups
 tags
 triggers
 version
-wrksrc
 xml_catalogs
 xml_entries" | tr '\n' '|')
 
@@ -466,7 +464,7 @@ for argument; do
 	scan 'distfiles=.*xorg\.freedesktop\.org/wiki/' 'use $XORG_HOME'
 	scan 'usr/lib/python3.[0-9]/site-packages' 'use $py3_sitelib'
 	scan 'pycompile_module=' 'do not set pycompile_module, it is autodetected'
-	scan '^wrksrc=(\$\{[^}]+\}|[^${}/])*/.+' 'wrksrc should be a top-level directory'
+	scan '^wrksrc=' 'wrksrc should not be defined'
 	scan '^\t*function\b' 'do not use the function keyword'
 	scan '^\t*[^ ]*  *\(\)' 'do not use space before function parenthesis'
 	scan '^\t*[^ ]*\(\)(|   *){' 'use one space after function parenthesis'
@@ -476,7 +474,6 @@ for argument; do
 	pkgname_re=$(echo "$pkgname" | regex_escape)
 	version=$(grep -Po "^version=\K.*" "$template" | once)
 	version_re=$(echo "$version" | regex_escape)
-	scan '^wrksrc="?(\$\{?pkgname\}?|'$pkgname_re')-(\$\{?version\}?|'$version_re')"?$' 'unnecessary wrksrc definition'
 	scan "distfiles=.*\Q$version_re\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'