From a0db467c7eb0e63b8e74887403689e2b446dde7f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 26 Jan 2014 13:06:31 +0100
Subject: fixup merge issues introduced in 796673c

Issues in doc/po/de.po (fixed by Chris already) and
test/integration/framework

Git-Dch: Ignore
---
 test/integration/framework | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/integration/framework b/test/integration/framework
index 5439244f7..5b9a58568 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -880,7 +880,8 @@ changetowebserver() {
 	fi
 	if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
 		cd aptarchive
-		if ! aptwebserver -o aptwebserver::fork=1 "$@" >webserver.log 2>&1 ; then
+		local LOG="webserver.log"
+		if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then
 			cat $LOG
 			false
 		fi
@@ -1006,7 +1007,6 @@ testequal() {
 	fi
 
 	local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile"
-	addtrap "rm $COMPAREFILE;"
 	echo "$1" > $COMPAREFILE
 	shift
 
-- 
cgit v1.2.3