summaryrefslogtreecommitdiff
path: root/arch-nspawn.in
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2020-02-04 14:41:53 -0500
committerLevente Polyak <anthraxx@archlinux.org>2020-02-27 14:50:27 +0100
commit94b0413e1399d92326de0851467b36998eee796b (patch)
treedcb1a99a4144b4d7cf90f5872504f97dd396ef5c /arch-nspawn.in
parente963b6da9e2c0aa82a0b80a5b6bfe7294561734f (diff)
downloaddevtools-94b0413e1399d92326de0851467b36998eee796b.tar.xz
arch-nspawn: fix up host_mirrors cachedir handling
This was incorrectly implemented in commit 00671765296ad598f392df7a542dbfca48a6e7b7, which added the host_mirrors root directory as a cachedir, when we actually want to use the pool/* subdirectories (the same ones installed on the build server's /etc/pacman.conf). Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
Diffstat (limited to 'arch-nspawn.in')
-rw-r--r--arch-nspawn.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 198d227..cde1f60 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -69,7 +69,9 @@ host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)e
for host_mirror in "${host_mirrors[@]}"; do
if [[ $host_mirror == *file://* ]]; then
host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
- in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
+ for m in "$host_mirror"/pool/*/; do
+ in_array "$m" "${cache_dirs[@]}" || cache_dirs+=("$m")
+ done
fi
done