From fecc9617dde25a9e4220a02d915d121ab1c3c1e0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 14 May 2010 15:25:07 +0200
Subject: [PATCH] Pass XBPS_MASTERDIR to the xbps-src signal handler.

---
 xbps-src/libexec/xbps-src-chroot-helper.sh.in | 4 +++-
 xbps-src/xbps-src.sh.in                       | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xbps-src/libexec/xbps-src-chroot-helper.sh.in b/xbps-src/libexec/xbps-src-chroot-helper.sh.in
index 3d3f0c9ec3..261bb48d5a 100644
--- a/xbps-src/libexec/xbps-src-chroot-helper.sh.in
+++ b/xbps-src/libexec/xbps-src-chroot-helper.sh.in
@@ -96,7 +96,9 @@ umount_chroot_fs()
 
 	# Remove created dirs
 	if [ ! -f ${XBPS_MASTERDIR}/.xbps_mount_bind_done ]; then
-		[ -d ${XBPS_MASTERDIR}/xbps ] && rmdir ${XBPS_MASTERDIR}/xbps
+		if [ -d ${XBPS_MASTERDIR}/xbps ]; then
+			rmdir ${XBPS_MASTERDIR}/xbps 2>/dev/null
+		fi
 	fi
 }
 
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index b791c37d74..56075b1f9b 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -33,13 +33,14 @@
 : ${xbps_machine:=$(uname -m)}
 : ${XBPS_UTILS_REQVER:=20100511}
 
-trap 'sighandler_exit $?' 0 INT QUIT
+trap '_MASTERDIR=${XBPS_MASTERDIR} sighandler_exit $?' 0 INT QUIT
 
 sighandler_exit()
 {
 	# Always unmount in case, we failed before!
 	if [ -z "$in_chroot" ]; then
-        	@@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-chroot-helper umount
+        	env MASTERDIR="${_MASTERDIR}" \
+			@@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-chroot-helper umount
 	fi
 	[ -n "$1" ] && exit $1
 	exit $?