[devtools,1/2] Revert "arch-nspawn: Work around pacman master returning file-URLs from the cache"

Message ID 20180123135733.32350-1-eschwartz@archlinux.org
State Accepted, archived
Headers show
Series [devtools,1/2] Revert "arch-nspawn: Work around pacman master returning file-URLs from the cache" | expand

Commit Message

Emil Velikov via arch-projects Jan. 23, 2018, 1:57 p.m. UTC
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.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 arch-nspawn.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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')