Merge branch 'update-checksums-on-edit' into 'master'

feat(build): update checksums when editing source files during build See merge request archlinux/devtools!240
fix(license): add .gitignore to REUSE defaults
2025-11-04 09:44:42 +01:00 · 2025-08-18 18:38:19 +03: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
5 changed files with 7 additions and 2 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/build/build.sh
+++ b/src/lib/build/build.sh
@@ -196,6 +196,7 @@ pkgctl_build() {
 				;;
 			-e|--edit)
 				EDIT=1
+				UPDATE_CHECKSUMS=1
 				shift
 				;;
 			-o|--offload)
--- 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
Caleb Maclennan	38cafefd79	Merge branch 'update-checksums-on-edit' into 'master' feat(build): update checksums when editing source files during build See merge request archlinux/devtools!240	2025-08-18 18:38:19 +03: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
Caleb Maclennan	f2db03786a	feat(build): update checksums when editing source files during build Using the --edit option while doing a build frequently implies making changes to the sources...whether it is updating a URL or dropping obsolete patches or other changes. It isn't a 100% correlation of course, but more often than not any changes made during editing are expected to also update the checksums to be in sync. Using the --pkgver option already triggers this, but other subsequent edits do not making for frequent failed edit/build cycles.	2024-03-02 11:22:31 +03:00