Merge branch 'patch-1' into 'master'

fix(license): add .gitignore to REUSE defaults See merge request archlinux/devtools!323
fix(commitpkg): Quiet git ls-files output
2025-09-13 18:06:19 +02:00 · 2025-08-01 09:23:09 -04:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-31 10:29:16 -04:00 · 2025-07-28 23:38:32 -04:00
2 changed files with 7 additions and 3 deletions
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -123,9 +123,10 @@ fi
 needsversioning=()

 if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
-	error "package doesn't have proper licensing information, set it up using:"
+	# TODO: Make this a hard failure in the future after packagers have had
+	# some time to add licenses to all packages.
+	warning "package doesn't have proper licensing information, set it up using:"
 	msg2 'pkgctl license setup'
-	exit 1
 else
 	pkgctl license check
 	needsversioning+=(REUSE.toml LICENSE LICENSES/*)
@@ -154,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/setup.sh
+++ b/src/lib/license/setup.sh
@@ -188,10 +188,13 @@ path = [
    "README.md",
    "keys/**",
    ".SRCINFO",
+    ".gitignore",
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
+    "*sysusers.conf",
    "*.tmpfiles",
+    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
Author	SHA1	Message	Date
Aaron Liu	6c401eb2b0	Merge branch 'patch-1' into 'master' fix(license): add .gitignore to REUSE defaults See merge request archlinux/devtools!323	2025-08-01 09:23:09 -04: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
Aaron Liu	dbc0ff209c	fix(license): add .gitignore to REUSE defaults 36 packages use this while 26 use .pam and 21 use .logrotate. Seems anecdotally common enough to add this here.	2025-07-31 10:29:16 -04: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