[SCM] live-build branch, debian, updated. debian/3.0_a41-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit ac004b56d239e88caa3edd986db8a24e7727a458
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 7 19:47:41 2012 +0100

    Adding support for apt preference.d in config/chroot_apt.

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 6414701..81990b1 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -108,6 +108,19 @@ case "${1}" in
 			cp config/chroot_apt/preferences chroot/etc/apt/preferences
 		fi
 
+		if Find_files config/chroot_apt/*.pref
+		then
+			for _FILE in config/chroot_apt/*.pref
+			do
+				if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}) chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig
+				fi
+
+				cp ${_FILE} chroot/etc/apt/preferences.d
+			done
+		fi
+
 		if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
 		then
 			echo >> chroot/etc/apt/preferences
@@ -236,6 +249,24 @@ EOF
 			fi
 		fi
 
+		if Find_files config/chroot_apt/*.pref
+		then
+			for _FILE in config/chroot_apt/*.pref
+			do
+				if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}) chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig
+				fi
+
+				cp ${_FILE} chroot/etc/apt/preferences.d
+
+				if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig chroot/etc/apt/preferences.d/$(basename ${_FILE})
+				fi
+			done
+		fi
+
 		if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
 		then
 			if [ -f chroot/etc/apt/preferences ]

-- 
live-build