Merge pull request distributed-system-analysis#222 from ndokos/wip-un…

…pack-clean-up Clean up the list file.
arcolife · May 2, 2016 · 92a2ca3 · 92a2ca3
2 parents 39ceb62 + 7224a5a
commit 92a2ca3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/server/pbench/bin/gold/test-5.txt b/server/pbench/bin/gold/test-5.txt
@@ -35,7 +35,6 @@ pbench-backup-tarballs: Missing target backup directory argument
 /var/tmp/pbench-test-server/pbench/public_html/incoming
 /var/tmp/pbench-test-server/pbench/public_html/results
 /var/tmp/pbench-test-server/pbench/tmp
-/var/tmp/pbench-test-server/pbench/tmp/pbench-unpack-tarballs.NNNN
 --- pbench tree state
 +++ pbench log file contents
 /var/tmp/pbench-test-server/pbench/logs/pbench-copy-sosreports/pbench-copy-sosreports.log:run-1900-01-01T00:00:00-UTC: starting at 1900-01-01T00:00:00-UTC

diff --git a/server/pbench/bin/pbench-unpack-tarballs b/server/pbench/bin/pbench-unpack-tarballs
@@ -83,6 +83,8 @@ echo $TS
 list=$TMP/pbench-unpack-tarballs.$$
 find -L $ARCHIVE/*/$linksrc -name '*.tar.xz' -printf "%s\t%p\n" 2>/dev/null | grep -v DUPLICATE | sort -n > $list
 
+trap 'rm -f $list' EXIT INT QUIT
+
 typeset -i ntb=0
 typeset -i ntotal=0
 typeset -i nerrs=0