fixup merge issues introduced in 796673c

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

Git-Dch: Ignore

diff --git a/test/integration/framework b/test/integration/framework
index 5439244f709b5e14f8db46fdf95076a292e65f0a..5b9a58568e09f8eacc10566b75a2259e3c527bbd 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -880,7 +880,8 @@ changetowebserver() {
        fi
        if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
                cd aptarchive
        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
                        cat $LOG
                        false
                fi


@@ -1006,7 +1007,6 @@ testequal() {
        fi
 
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile"
        fi
 
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile"

-       addtrap "rm $COMPAREFILE;"

        echo "$1" > $COMPAREFILE
        shift
 
        echo "$1" > $COMPAREFILE
        shift