Merge branch 'upstream'

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

diff --git a/server-src/amverify.sh b/server-src/amverify.sh
index 7ed64cce8872c867bcb49cfb3ae585d6f5bb4f79..5614b725d9a92a4424b2d58eab52677a18e719f1 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' 0
+trap 'rm -fr $TEMP' EXIT
 if ( umask 077 ; mkdir $TEMP ) ; then
        :
 else
@@ -427,6 +427,9 @@ 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
@@ -498,4 +501,7 @@ done
 
 sendreport
 
+rm -fr $TEMP
+trap - EXIT
+
 exit 0