From 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu, 12 Mar 2020 01:21:39 +0000
Subject: stagefiles: simplify & robustify

 - avoid all need to pass ".build/" path in stage file names into the
   functions
 - add a helper to remove a stage file (required to complete the above
   properly)
 - avoid duplicating filenames within scripts which makes them prone to
   mistakes (some instances of which I've actually encountered and had
   to fix)

Gbp-Dch: Short
---
 scripts/build/binary | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts/build/binary')

diff --git a/scripts/build/binary b/scripts/build/binary
index 07863073e..e1d28a241 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -86,7 +86,8 @@ lb binary_zsync ${@}
 if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 then
 	# Deconfiguring chroot
-	rm -f .build/chroot_archives
+	Remove_stagefile chroot_archives
+
 	lb chroot_apt remove ${@}
 	lb chroot_hostname remove ${@}
 	lb chroot_resolv remove ${@}
-- 
cgit v1.2.3