Merge branch 'arch-nspawn-read-CacheDir-from-host' into 'master'

arch-nspawn: read CacheDir option from host's conf See merge request archlinux/devtools!95
arch-nspawn: read CacheDir option from host's conf
2025-09-30 17:56:17 +02:00 · 2025-07-26 10:04:23 +03:00 · 2022-03-20 10:44:45 +02:00
5 changed files with 3 additions and 7 deletions
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
-	license
 	release
 	repo
 	search
--- a/doc/man/pkgctl-auth.1.asciidoc
+++ b/doc/man/pkgctl-auth.1.asciidoc
@@ -3,7 +3,7 @@ pkgctl-auth(1)

 Name
 ----
-pkgctl-auth - Authenticate with services like GitLab.
+pkgctl-auth - Authenticate with serivces like GitLab.

 Synopsis
 --------
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -69,7 +69,7 @@ nspawn_args=(
 )

 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+	mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi

 # shellcheck disable=2016
--- 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" >/dev/null; then
+		if ! git ls-files --error-unmatch "$file"; then
 			die "%s is not under version control" "$file"
 		fi
 	done
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -188,13 +188,10 @@ path = [
    "README.md",
    "keys/**",
    ".SRCINFO",
-    ".gitignore",
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
-    "*sysusers.conf",
    "*.tmpfiles",
-    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",