From 6c3b31bea4eb1915ea738ec968352b1e52e53289 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 18 May 2017 09:01:16 +0200
Subject: bin/return-assignment: bugfix multiple traps

---
 bin/return-assignment | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/return-assignment b/bin/return-assignment
index ab8b151..def362c 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -29,11 +29,11 @@ fi
   exit 1
 fi
 
-function clean_up {
+function clean_up_lock_file {
   rm -f "${build_list_lock_file}"
 }
 
-trap clean_up EXIT
+trap clean_up_lock_file EXIT
 
 if [ "$5" == 'ERROR' ]; then
 # the build failed on the build slave
@@ -70,14 +70,15 @@ if ! grep -q "^${1//./\\.} $2 $3 $4\$" "${work_dir}/build-list"; then
   exit 2
 fi
 
-function clean_up {
+function clean_up_tmp_dir {
   popd > /dev/null
   rm -rf --one-file-system "${tmp_dir}"
+  clean_up_lock_file
 }
 
 tmp_dir="$(mktemp -d)"
 pushd "${tmp_dir}" > /dev/null
-trap clean_up EXIT
+trap clean_up_tmp_dir EXIT
 
 # extract package(s)
 tar -x
-- 
cgit v1.2.3-54-g00ecf