[dh-r] 02/02: Use suggested debci method to cleanup after testing

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository dh-r.

commit a1e9a86f80a0c0cc85e01da1bfffb978cd692964
Author: Andreas Tille <tille at debian.org>
Date:   Mon Dec 19 09:23:52 2016 +0100

    Use suggested debci method to cleanup after testing
---
 debian/changelog  | 1 +
 scripts/dh-make-R | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dff643d..1084bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dh-r (20161219) UNRELEASED; urgency=medium
 
   * Team upload
   * Add manpage for dh-make-R
+  * Use suggested debci method to cleanup after testing
 
  -- Andreas Tille <tille at debian.org>  Mon, 19 Dec 2016 09:17:52 +0100
 
diff --git a/scripts/dh-make-R b/scripts/dh-make-R
index d5cd185..bf2419f 100755
--- a/scripts/dh-make-R
+++ b/scripts/dh-make-R
@@ -211,6 +211,7 @@ debname=$debname
 
 if [ \$ADTTMP = "" ] ; then
     ADTTMP=`mktemp -d /tmp/\${debname}-test.XXXXXX`
+    trap "rm -rf \$ADTTMP" 0 INT QUIT ABRT PIPE TERM
 fi
 cd \$ADTTMP
 cp -a /usr/share/doc/\$debname/tests/* \$ADTTMP
@@ -219,7 +220,6 @@ for testfile in *.R; do
     echo "BEGIN TEST \$testfile"
     LC_ALL=C R --no-save < \$testfile
 done
-rm -rf \$ADTTMP/*
 EOF
 
 my $test_bioc = <<"EOF";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dh-r.git