From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 16 Jan 2014 16:21:13 +0000 (+0100)
Subject: show the error message if the webserver start failed
X-Git-Tag: 0.9.15.1~11^2~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/bee0670b2dc8c50ddfc65731c00383da4d377cae

show the error message if the webserver start failed

Can happen e.g. if port 8080 is already used by something else

Git-Dch: Ignore
---

diff --git a/test/integration/framework b/test/integration/framework
index 60a8167fa..c4953812b 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -835,10 +835,14 @@ changetowebserver() {
 	else
 		shift
 	fi
-	local LOG='/dev/null'
 	if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
 		cd aptarchive
-		aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1
+		local LOG="$(mktemp)"
+		addtrap "rm $LOG;"
+		if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then
+			cat $LOG
+			false
+		fi
 		local PID="$(cat aptwebserver.pid)"
 		if [ -z "$PID" ]; then
 			msgdie 'Could not fork aptwebserver successfully'