Pass XBPS_MASTERDIR to the xbps-src signal handler.

2010-05-14 15:25:07 +02:00
parent fe36d782ca
commit fecc9617dd
2 changed files with 6 additions and 3 deletions
--- 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 $?