[SCM] debian-live/live-helper branch, master, updated. 1.0_a40-1-5-g92edfe3

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 92edfe399bae94b9e2545f62e14d0bcccb310e8c
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 21 22:51:15 2008 +0100

    Switching default of LH_APT from aptitude to apt for >= lenny.
    
    Apt in lenny also supports tracking of 'orphaned' packages. If aptitude is
    installed, apt can't be removed, so by switching to apt making the default
    images a tiny bit smaller. And, aptitude got mainly default because of the
    sarge->etch update recommendation.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index ddaf9a7..70aa6f2 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -34,7 +34,12 @@ Set_defaults ()
 	fi
 
 	# Setting package manager
-	LH_APT="${LH_APT:-aptitude}"
+	if [ "${LH_DISTRIBUTION}" = "etch" ]
+	then
+		LH_APT="${LH_APT:-aptitude}"
+	else
+		LH_APT="${LH_APT:-apt}"
+	fi
 
 	# Setting apt ftp proxy
 	if [ -z "${LH_APT_FTP_PROXY}" ] && [ -n "${ftp_proxy}" ]

-- 
debian-live/live-helper