[SCM] live-build branch, debian-next, updated. debian/3.0_a25-1-36-g046e32b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 046e32b5b0c11f10a1d5386375ae30f0835d0aee
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jul 24 09:28:49 2011 +0200

    Add forgotten handling of already set chroot_hooks in defaults.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 436b19d..701ae3a 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -584,16 +584,16 @@ Set_defaults ()
 	# Setting distribution hooks
 	case "${LB_MODE}" in
 		*)
-			LB_CHROOT_HOOKS="update-apt-xapian-index \
+			LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-update-apt-xapian-index \
 					 update-mlocate-database \
-					 remove-python-py"
+					 remove-python-py}"
 			;;
 
 		kubuntu)
-			LB_CHROOT_HOOKS="update-apt-xapian-index \
+			LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-update-apt-xapian-index \
 					 update-mlocate-database \
 					 remove-gnome-icon-cache \
-					 remove-python-py"
+					 remove-python-py}"
 			;;
 	esac
 

-- 
live-build