From a4c006633a9e411c5526fa57cd85bec020b6565c Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Mon, 25 May 2015 23:09:42 -0600 Subject: [PATCH] Import patches-unapplied version 2.302 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 4c697dbaf6165eb0affff43de8b33de465120041 New changelog entries: * Call Setup_cleanup in live-build/auto/build to set exit handler. --- debian/changelog | 6 ++++++ live-build/auto/build | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index eaf40597..a261ad11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.302) wily; urgency=medium + + * Call Setup_cleanup in live-build/auto/build to set exit handler. + + -- Adam Conrad Mon, 25 May 2015 23:09:42 -0600 + livecd-rootfs (2.301) wily; urgency=low [ Michael Vogt ] diff --git a/live-build/auto/build b/live-build/auto/build index 539ac7c2..3c5d203f 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -10,6 +10,9 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults +# Setup cleanup function +Setup_cleanup + rm -f binary.success ( if [ -d config/gnupg ]; then