Merge branch 'datadir' into 'master'

test/bin/pkgctl: set DATADIR to build directory See merge request archlinux/devtools!326
fix(license): add .gitignore to REUSE defaults
2025-09-13 01:46:19 +02:00 · 2025-08-12 05:56:16 +00:00 · 2025-08-08 14:13:32 +02:00 · 2025-08-06 05:01:44 +01:00 · 2025-08-05 17:48:12 +02:00 · 2025-08-01 11:26:57 +02:00
5 changed files with 7 additions and 3 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/archbuild.in
+++ b/src/archbuild.in
@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
 makechrootpkg_args+=("${@:$OPTIND}")

 # Automatically recreate the root chroot if a version mismatch is detected
-CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
+CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
 if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
 	warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
 	clean_first=true
--- 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/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",
--- a/test/bin/pkgctl
+++ b/test/bin/pkgctl
@@ -4,7 +4,7 @@ set -e
 root="$(dirname -- "$(readlink -f -- "$0")")/../.."

 # always build everything so we use an up-to-date state
-make -C "${root}" -j --no-print-directory --silent
+make -C "${root}" -j --no-print-directory --silent DATADIR="${root}/build"

 # run pkgctl from the build directory
 export PATH="${root}/build/bin:${PATH}"
Author	SHA1	Message	Date
Morgan Adamiec	1509129d70	Merge branch 'datadir' into 'master' test/bin/pkgctl: set DATADIR to build directory See merge request archlinux/devtools!326	2025-08-12 05:56:16 +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
morganamilo	5d79a52199	test/bin/pkgctl: set DATADIR to build directory If datadir is unset, it defaults to /usr/local/share/devtools. Causing builds to fail as they try to read files that don't exist.	2025-08-06 05:01:44 +01: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