From d7064dfb271fca5b779e18655102d2eddecd0c35 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 27 Aug 2012 14:43:27 +0200
Subject: Applying patch from Colin Watson <cjwatson@ubuntu.com> to correct
 chroot hooks execution (Closes: #685534).

---
 scripts/build/lb_chroot_hooks | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'scripts/build/lb_chroot_hooks')

diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index 0ccfe2b32..e8a03d0f6 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -54,12 +54,14 @@ for _HOOK in ${LB_CHROOT_HOOKS}
 do
 	for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
 	do
-		if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ]
-		then
-			mkdir -p chroot/root/lb_chroot_hooks
-			cp "${LOCATION}"/hooks/???-"${_HOOK}".chroot chroot/root/lb_chroot_hooks
-			continue
-		fi
+		for FILE in "${LOCATION}"/???-"${_HOOK}".chroot
+		do
+			if [ -e "${FILE}" ]
+			then
+				mkdir -p chroot/root/lb_chroot_hooks
+				cp "${FILE}" chroot/root/lb_chroot_hooks
+			fi
+		done
 	done
 done
 
-- 
cgit v1.2.3