revert to upstream

[debian/amanda] / server-src / amverify.sh

diff --git a/server-src/amverify.sh b/server-src/amverify.sh
index 5614b725d9a92a4424b2d58eab52677a18e719f1..7ed64cce8872c867bcb49cfb3ae585d6f5bb4f79 100644 (file)
--- a/server-src/amverify.sh
+++ b/server-src/amverify.sh
@@ -312,7 +312,7 @@ fi
 cd @AMANDA_TMPDIR@ || exit 1
 
 TEMP=@AMANDA_TMPDIR@/amverify.$$
-trap 'rm -fr $TEMP' EXIT
+trap 'rm -fr $TEMP' 0
 if ( umask 077 ; mkdir $TEMP ) ; then
        :
 else
@@ -427,9 +427,6 @@ while [ $SLOT -lt $SLOTS ]; do
                         # Unless we went over, there is no extra output.
                        report "End-of-Tape detected."
                        break
-               elif [ -n "$EOI" ]; then
-                        report "End-of-Information detected."
-                        break
                else
                        report "** Error detected ($FILE)"
                        echo "$VOLUME ($FILE):" >>$DEFECTS
@@ -501,7 +498,4 @@ done
 
 sendreport
 
-rm -fr $TEMP
-trap - EXIT
-
 exit 0