Imported Debian patch 2.4.5p1-2

[debian/amanda] / server-src / amverifyrun.sh.in

diff --git a/server-src/amverifyrun.sh.in b/server-src/amverifyrun.sh.in
index 4404e1b06e7afd5bb327549bd3eb82ee6764d101..389679f97925122b0300b0ff30354104988fe8f1 100644 (file)
--- a/server-src/amverifyrun.sh.in
+++ b/server-src/amverifyrun.sh.in
@@ -48,11 +48,17 @@ else
 fi
 
 
-FIRST_SLOT=`grep "taper: slot" $AMLOG | sed 1q | sed 's/://g' | awk '{print $3}'`
+FIRST_SLOT=`grep "taper: slot" $AMLOG | fgrep 'exact label match
+new tape
+first labelstr match' | sed 1q | sed 's/://g' | awk '{print $3}'`
 if [ X"$FIRST_SLOT" = X"" ]; then
   FIRST_SLOT='-1'
 fi
 
 NBTAPES=`grep -c "taper: wrote label " $AMLOG`
 
-$AMVERIFY $CONFIG $FIRST_SLOT $NBTAPES
+if [ X"$NBTAPES" != X"0" ]; then
+  $AMVERIFY $CONFIG $FIRST_SLOT $NBTAPES
+else
+  echo "Nothing to verify"
+fi