summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2017-10-01 05:31:23 +0200
committerEli Schwartz <eschwartz@archlinux.org>2018-05-13 15:16:20 +0200
commit4408bb2a1529b5a1e62e12ac617daac945d44e27 (patch)
treee0a526b8db618dc77426d3a62e3b6f767a38d135
parent509c00ea23e676d97072786f1fbe97dc23fa898b (diff)
downloaddevtools-4408bb2a1529b5a1e62e12ac617daac945d44e27.tar.gz
devtools-4408bb2a1529b5a1e62e12ac617daac945d44e27.tar.xz
Revert "arch-nspawn: Work around pacman master returning file-URLs from the cache"
This reverts commit eb6b0e3f11279b6512b1469ff042d2982eaaeef4. This never worked, as pacman-git returns file urls from the cache anyway and pacman stable doesn't have any problem at all. Having useless code which makes people think the issue is solved when it really isn't, is bloat, so remove it.
-rw-r--r--arch-nspawn.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 7a7a274..50ce674 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -59,7 +59,7 @@ else
fi
# shellcheck disable=2016
-host_mirror=$(pacman --cachedir /doesnt/exist -Sddp extra/devtools 2>/dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
+host_mirror=$(pacman -Sddp extra/devtools 2>/dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
# shellcheck disable=2016
[[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')