[SCM] debian-live branch, master, updated. 1.0_a48-1-50-g2ae826a

[Chris Lamb]

The following commit has been merged in the master branch:
commit 2ae826ad3f5849dedb954ed13dc518a4a8c6b12c
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Aug 12 01:21:57 2008 +0100

    Don't remove the chroot's APT configuration (Closes: #494640)
    
    This is to ensure that the binary stages respect the user's LH_APT_*
    settings, particulary LH_APT_RECOMMENDS. lh_binary cannot call
    `lh_chroot_apt install` because the binary stages must have a different
    apt_preferences(5) configuration than the chroot stage to handle local
    packages correctly.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 1e6ab56..884d01a 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -134,24 +134,6 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Deconfiguring aptitude ftp proxy
-		rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
-
-		# Deconfiguring aptitude http proxy
-		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
-
-		# Deconfiguring aptitude pdiffs
-		rm -f chroot/etc/apt/apt.conf.d/00pdiffs
-
-		# Deconfiguring aptitude pipeline
-		rm -f chroot/etc/apt/apt.conf.d/00pipeline
-
-		# Deconfiguring aptitude recommends
-		rm -f chroot/etc/apt/apt.conf.d/00recommends
-
-		# Deconfiguring aptitude secure
-		rm -f chroot/etc/apt/apt.conf.d/00secure
-
 		# Deconfiguring apt preferences
 		if [ -f chroot/etc/apt/preferences.orig ]
 		then

-- 
debian-live