prevent double reports from amverify

diff --git a/debian/changelog b/debian/changelog
index 38d7f2a9347fa931188285d5b6192ed8ae7ee2b6..bbb77e91306e9364c64a9e6918778791151a98e2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ amanda (1:2.5.2p1-4) UNRELEASED; urgency=high
   * freshen to latest standards version
   * revert chg-multi.sh.in and patch since the new version previously pulled 
     in caused more problems than it solved, closes: #486384
+  * undo traps on amverify exit to prevent double reports, closes: #487405
 
  -- Bdale Garbee <bdale@gag.com>  Sat, 16 Aug 2008 12:05:05 -0300
 

diff --git a/server-src/amverify.sh.in b/server-src/amverify.sh.in
index d146043e38924c8046e53a7401a305d53f530295..38859c374301aee51dcae6267024e3aa8ac1b81f 100644 (file)
--- a/server-src/amverify.sh.in
+++ b/server-src/amverify.sh.in
@@ -543,4 +543,7 @@ done
 
 sendreport
 
+rm -fr $TEMP
+trap - EXIT
+
 exit 0