Merge branch 'feat/license-check-no-source-pkgbuild' into 'master'

chore(license): avoid sourcing PKGBUILD in check subcommand See merge request archlinux/devtools!322
chore(license): avoid sourcing PKGBUILD in check subcommand
2025-09-13 09:56:18 +02:00 · 2025-08-02 06:30:38 +02:00 · 2025-08-02 06:30:25 +02:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00
3 changed files with 11 additions and 9 deletions
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done
--- a/src/lib/license/check.sh
+++ b/src/lib/license/check.sh
@@ -94,19 +94,19 @@ pkgctl_license_check() {
 		pushd "${path}" >/dev/null

 		if [[ ! -f PKGBUILD ]]; then
-			msg_error "${BOLD}${pkgbase}:${ALL_OFF} no PKGBUILD found"
+			msg_error "${BOLD}${path}:${ALL_OFF} no PKGBUILD found"
 			return 1
 		fi

-		# reset common PKGBUILD variables
-		unset pkgbase
-
-		# shellcheck source=contrib/makepkg/PKGBUILD.proto
-		if ! . ./PKGBUILD; then
-			msg_error "${BOLD}${pkgbase}:${ALL_OFF} failed to source PKGBUILD"
+		if [[ ! -f .SRCINFO ]]; then
+			msg_error "${BOLD}${path}:${ALL_OFF} no .SRCINFO found"
+			return 1
+		fi
+
+		if ! pkgbase=$(grep --max-count=1 --extended-regexp "pkgbase = (.+)" .SRCINFO | awk '{print $3}'); then
+			msg_error "${BOLD}${path}:${ALL_OFF} pkgbase not found in .SRCINFO"
 			return 1
 		fi
-		pkgbase=${pkgbase:-$pkgname}

 		if [[ ! -e LICENSE ]]; then
 			msg_error "${BOLD}${pkgbase}:${ALL_OFF} is missing the LICENSE file"
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -191,7 +191,9 @@ path = [
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
+    "*sysusers.conf",
    "*.tmpfiles",
+    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
Author	SHA1	Message	Date
Levente Polyak	98e6c20e19	Merge branch 'feat/license-check-no-source-pkgbuild' into 'master' chore(license): avoid sourcing PKGBUILD in check subcommand See merge request archlinux/devtools!322	2025-08-02 06:30:38 +02:00
Levente Polyak	7a64d33b88	chore(license): avoid sourcing PKGBUILD in check subcommand We don't actually need any data from the package, except the pkgbase which is exclusively used during logging. Simply grep the pkgbase name and use the path during early code path issues. Component: pkgctl license check	2025-08-02 06:30:25 +02:00
Christian Heusel	01757e6904	fix(commitpkg): Quiet git ls-files output So far all files in `needsversioning=(...)` have been printed to the command line if they were found, which is not useful, especially now that we have more files present there. It makes sense however to keep the standard error output, as this gives a actionable suggestion what one should to to fix the issue: > error: pathspec 'PKGBUILD' did not match any file(s) known to git > Did you forget to 'git add'? Fixes #281 Signed-off-by: Christian Heusel <christian@heusel.eu>	2025-08-01 11:26:57 +02:00
Daniel M. Capella	c5fe8ff3e6	feat(license): Extend matches for sysusers/tmpfiles configs Eg. to match: - sysusers.conf - $pkgname.sysusers - $pkgname.sysusers.conf	2025-07-28 23:38:32 -04:00