Merge branch 'felixonmars-master-patch-03177' into 'master'

export-pkgbuild-keys: use export-clean instead of export-minimal Closes #93 See merge request archlinux/devtools!116
fix(commitpkg): Quiet git ls-files output
2025-09-13 09:56:18 +02:00 · 2025-08-05 11:14:16 +08:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00 · 2022-09-28 07:46:44 +00:00
3 changed files with 7 additions and 4 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/export-pkgbuild-keys.in
+++ b/src/export-pkgbuild-keys.in
@@ -57,7 +57,7 @@ mkdir -p keys/pgp
 error=0

 for key in "${validpgpkeys[@]}"; do
-	gpg --output "$TEMPDIR/$key.asc" --armor --export --export-options export-minimal "$key" 2>/dev/null
+	gpg --output "$TEMPDIR/$key.asc" --armor --export --export-options export-clean "$key" 2>/dev/null

 	# gpg does not give a non-zero return value if it fails to export...
 	if [[ -f $TEMPDIR/$key.asc ]]; then
--- 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
Felix Yan	a356a94c6a	Merge branch 'felixonmars-master-patch-03177' into 'master' export-pkgbuild-keys: use export-clean instead of export-minimal Closes #93 See merge request archlinux/devtools!116	2025-08-05 11:14:16 +08: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
Felix Yan	7f2904d069	export-pkgbuild-keys: use export-clean instead of export-minimal Fixes #93	2022-09-28 07:46:44 +00:00