r2662 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-03 06:46:44 +0000 (Fri, 03 Aug 2007)
New Revision: 2662

Modified:
   dists/trunk/live-helper/helpers/lh_chroot_apt
Log:


Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt	2007-08-02 19:26:41 UTC (rev 2661)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt	2007-08-03 06:46:44 UTC (rev 2662)
@@ -80,18 +80,17 @@
 		fi
 
 		# Configuring apt recommends
-		if [ "${LH_APT}" = "aptitude" ]
-		then
-			case "${LH_APT_RECOMMENDS}" in
-				enabled)
-					echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
-					;;
+		case "${LH_APT_RECOMMENDS}" in
+			enabled)
+				echo "APT::Install-Recommends=True" > chroot/etc/apt/apt.conf.d/00recommends
+				echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
+				;;
 
-				disabled)
-					echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
-					;;
-			esac
-		fi
+			disabled)
+				echo "APT::Install-Recommends=False" > chroot/etc/apt/apt.conf.d/00recommends
+				echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends
+				;;
+		esac
 
 		# Configuring apt secure
 		case "${LH_APT_SECURE}" in