Merge branch 'diffpkg-continue' into 'master'

diffpkg: Skip packages that fail to fetch See merge request archlinux/devtools!156
fix(license): add .gitignore to REUSE defaults
2025-09-14 10:26:18 +02:00 · 2025-08-15 07:54:26 +00:00 · 2025-08-08 14:13:32 +02:00 · 2025-08-05 17:48:12 +02:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00
4 changed files with 9 additions and 4 deletions
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
 	license
 	release
 	repo
 	search
--- 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/diffpkg.in
+++ b/src/diffpkg.in
@@ -328,7 +328,7 @@ if (( $# < 2 )); then
 			comparepkg="$1"
 		fi
-		oldpkg=$(fetch_pkg "$comparepkg") || exit 1
+		oldpkg=$(fetch_pkg "$comparepkg") || continue
 		diff_pkgs "$oldpkg" "$pkgfile"
 	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
Jan Alexander Steffens (heftig)	45080d241e	Merge branch 'diffpkg-continue' into 'master' diffpkg: Skip packages that fail to fetch See merge request archlinux/devtools!156	2025-08-15 07:54:26 +00:00
Aaron Liu	3f0ebbc6d2	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-08-08 14:13:32 +02:00
Jakub Klinkovský	fc56ebedf3	fix(completion): fix bash completion for the license subcommand Signed-off-by: Jakub Klinkovský <lahwaacz@archlinux.org>	2025-08-05 17:48:12 +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
Jan Alexander Steffens (heftig)	058e68a7b5	diffpkg: Skip packages that fail to fetch New (split) packages won't exist in the repos. If we fail to fetch a package, don't die but complain and proceed with the next pkgname.	2023-05-21 16:50:49 +02:00