Re: [arch-projects] [devtools] [PATCH] mkarchroot: use pacman-conf for obtaining CacheDir
On 2/19/19 2:54 PM, Jelle van der Waa wrote: > Instead of using sed/grep and relying on the output of 'pacman -v' use > pacman-conf for obtaining the configuration value of the CacheDir. Misses the same change in arch-nspawn, see for example https://github.com/eli-schwartz/devtools/commit/2bfe582bee3c4d17314e46bb15c03f75cc269dc8 -- Eli Schwartz Bug Wrangler and Trusted User signature.asc Description: OpenPGP digital signature
[arch-projects] [devtools] [PATCH] mkarchroot: use pacman-conf for obtaining CacheDir
Instead of using sed/grep and relying on the output of 'pacman -v' use pacman-conf for obtaining the configuration value of the CacheDir. Signed-off-by: Jelle van der Waa --- mkarchroot.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkarchroot.in b/mkarchroot.in index 52e363f..bae6b5a 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -52,7 +52,7 @@ shift 1 [[ -z $working_dir ]] && die 'Please specify a working directory.' if [[ -z $cache_dir ]]; then - cache_dirs=($(pacman -v "$cache_conf" 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) + cache_dirs=($(pacman-conf CacheDir)) else cache_dirs=(${cache_dir}) fi -- 2.20.1
[arch-projects] [devtools] [PATCH] crossrepomove: do not set svn propset
svn propset's where determined to be non-reproducible and therefore where removed from svn. Don't introduce them when moving packages between repos. Signed-off-by: Jelle van der Waa --- crossrepomove.in | 1 - 1 file changed, 1 deletion(-) diff --git a/crossrepomove.in b/crossrepomove.in index b45b8ae..a88b722 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -64,7 +64,6 @@ done msg "Adding %s to %s" "${pkgbase}" "${target_repo}" svn -q add "target_checkout/${pkgbase}" -svn -q propset svn:keywords 'Id' "target_checkout/${pkgbase}/trunk/PKGBUILD" svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" target_checkout pushd "target_checkout/${pkgbase}/trunk" >/dev/null archrelease "${arch[@]/#/$target_repo-}" || die -- 2.20.1