Merge branch 'run-inside-service' into 'master'

feat(arch-nspawn): use --keep-unit when running inside a service See merge request archlinux/devtools!197
fix(completion): fix bash completion for the license subcommand
2025-09-12 17:36:18 +02:00 · 2025-08-10 00:53:17 +00: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 · 2024-04-28 11:28:11 +08:00
4 changed files with 13 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/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -61,13 +61,20 @@ nspawn_args=(
 	--directory="$working_dir"
 	--setenv="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin"
 	--register=no
-	--slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")"
-	--machine="arch-nspawn-$$"
 	--as-pid2
 	--console=autopipe
 	--timezone=off
 )

+if [[ ${DEVTOOLS_KEEP_UNIT:-0} == 1 ]]; then
+	nspawn_args+=(--keep-unit)
+else
+	nspawn_args+=(
+		--slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")"
+		--machine="arch-nspawn-$$"
+	)
+fi
+
 if (( ${#cache_dirs[@]} == 0 )); then
 	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
--- 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
@@ -191,7 +191,9 @@ path = [
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
+    "*sysusers.conf",
    "*.tmpfiles",
+    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
Author	SHA1	Message	Date
lilydjwg lilydjwg	65fc650e80	Merge branch 'run-inside-service' into 'master' feat(arch-nspawn): use --keep-unit when running inside a service See merge request archlinux/devtools!197	2025-08-10 00:53:17 +00: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
lilydjwg	2c792e44aa	feat(arch-nspawn): use --keep-unit when $DEVTOOLS_KEEP_UNIT is set to 1	2024-04-28 11:28:11 +08:00