From ad1c1d1f8b32803589e979d13d7cab79b492167e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Mon, 13 Aug 2018 01:54:49 -0400
Subject: libreblacklist: Better diagnostic output on update failure

---
 src/lib/blacklist.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lib/blacklist.sh b/src/lib/blacklist.sh
index 76b00ad..84333e8 100755
--- a/src/lib/blacklist.sh
+++ b/src/lib/blacklist.sh
@@ -60,14 +60,18 @@ blacklist-update() (
 
 	mkdir -p "${local_blacklist%/*}"
 
-	local tmpfile
-	tmpfile="$(mktemp "${local_blacklist}.part.XXXXXXXXXX")"
-	if wget -N -q -O "$tmpfile" "$remote_blacklist" 2>/dev/null; then
-		mv -f -- "$tmpfile" "$local_blacklist"
+	local tmp_blacklist tmp_log
+	tmp_blacklist="$(mktemp "${local_blacklist}.part.XXXXXXXXXX")"
+	tmp_log="$(mktemp -t "${0##*/}.wget-log.XXXXXXXXXX")"
+	if wget -o "$tmp_log" -O "$tmp_blacklist" -- "$remote_blacklist"; then
+		mv -fT -- "$tmp_blacklist" "$local_blacklist"
+		rm -f -- "$tmp_log"
 		stat_done
 	else
-		rm -f -- "$tmpfile"
+		rm -f -- "$tmp_blacklist"
 		stat_done
+		sed 's/^/    /' <"$tmp_log" >&2
+		rm -f -- "$tmp_log"
 		if [[ -e "$local_blacklist" ]]; then
 			_l warning "Using old local cache of blacklist"
 		else
-- 
cgit v1.2.2