[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit ac6147adb7ccf6709d4939e45789415656eed7b0
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jul 19 10:57:02 2011 +0200

    Consolidating local hooks for chroot and binary into config/hooks/*.{chroot,binary}.

diff --git a/scripts/build/lb_binary_local-hooks b/scripts/build/lb_binary_local-hooks
index e3c08c2..f9a8f61 100755
--- a/scripts/build/lb_binary_local-hooks
+++ b/scripts/build/lb_binary_local-hooks
@@ -39,9 +39,9 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Processing local-hooks
-if Find_files config/binary_local-hooks/*
+if Find_files config/hooks/*.binary
 then
-	for HOOK in config/binary_local-hooks/*
+	for HOOK in config/hooks/*.binary
 	do
 		# Making hook executable
 		if [ ! -x "${HOOK}" ]
diff --git a/scripts/build/lb_chroot_local-hooks b/scripts/build/lb_chroot_local-hooks
index c6482c5..f7bc574 100755
--- a/scripts/build/lb_chroot_local-hooks
+++ b/scripts/build/lb_chroot_local-hooks
@@ -39,12 +39,12 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Processing local-hooks
-if Find_files config/chroot_local-hooks/*
+if Find_files config/hooks/*.chroot
 then
 	# Restoring cache
 	Restore_cache cache/packages_chroot
 
-	for HOOK in config/chroot_local-hooks/*
+	for HOOK in config/hooks/*.chroot
 	do
 		# Copying hook
 		cp "${HOOK}" chroot/root
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ad144aa..0e478a3 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1150,7 +1150,7 @@ EOF
 # Creating lb_chroot_* configuration
 mkdir -p config/archives
 mkdir -p config/chroot_apt
-mkdir -p config/chroot_local-hooks
+mkdir -p config/hooks
 mkdir -p config/chroot_local-includes
 mkdir -p config/chroot_local-patches
 mkdir -p config/chroot_packages
@@ -1223,7 +1223,6 @@ mkdir -p config/binary_debian-installer
 mkdir -p config/binary_debian-installer-includes
 mkdir -p config/binary_grub
 mkdir -p config/binary_local-debs
-mkdir -p config/binary_local-hooks
 mkdir -p config/binary_local-includes
 mkdir -p config/package-lists
 mkdir -p config/binary_local-udebs

-- 
live-build