[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-35-gcc3a26c

[Daniel Baumann]

The following commit has been merged in the master branch:
commit cc3a26c8407c997884f42784901e67f3991b4beb
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 9 14:40:36 2009 +0200

    Removing some code in chroot_apt helper that left over the preferences files in the final image.

diff --git a/helpers/lh_binary b/helpers/lh_binary
index 7dcb281..2b299e7 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -88,6 +88,7 @@ then
 	lh_chroot_hosts remove ${*}
 fi
 
+lh_chroot_apt remove ${*}
 lh_chroot_sysfs remove ${*}
 lh_chroot_selinuxfs remove ${*}
 lh_chroot_proc remove ${*}
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 1d2dd73..1196cea 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -207,21 +207,6 @@ case "${1}" in
 			rm -f chroot/etc/apt/preferences
 		fi
 
-		if Find_files config/chroot_local-packages/*.deb
-		then
-			# Ensure local packages are not replaced.
-			echo >> chroot/etc/apt/preferences
-			echo "# Added by lh_chroot_apt ${@}" >> chroot/etc/apt/preferences
-			echo "Package: *" >> chroot/etc/apt/preferences
-			echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences
-			echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
-
-			echo >> chroot/etc/apt/preferences
-			echo "Package: *" >> chroot/etc/apt/preferences
-			echo "Pin: release o=debian" >> chroot/etc/apt/preferences
-			echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
-		fi
-
 		# Removing stage file
 		rm -f .stage/chroot_apt
 		;;

-- 
Debian Live build scripts