[Debian-live-changes] r1928 - in dists/trunk/live-helper: docs helpers

[otavio at alioth.debian.org]

Author: otavio
Date: 2007-06-02 20:56:10 +0000 (Sat, 02 Jun 2007)
New Revision: 1928

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_chroot_preseed
Log:
helpers/lh_chroot_preseed: Use {Check,Install,Remove}_package to handle debconf-utils dependency.


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-06-02 20:35:03 UTC (rev 1927)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-06-02 20:56:10 UTC (rev 1928)
@@ -1,5 +1,8 @@
 2007-06-02  Otavio Salvador  <otavio at debian.org>
 
+	* helpers/lh_chroot_preseed: Use {Check,Install,Remove}_package to
+	handle debconf-utils dependency.
+
 	* Add support to specify the apt/aptitude pipeline depth.
 
 2007-06-02  Daniel Baumann  <daniel at debian.org>

Modified: dists/trunk/live-helper/helpers/lh_chroot_preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_preseed	2007-06-02 20:35:03 UTC (rev 1927)
+++ dists/trunk/live-helper/helpers/lh_chroot_preseed	2007-06-02 20:56:10 UTC (rev 1928)
@@ -48,16 +48,11 @@
 then
 	if [ -f "${LIVE_PRESEED}" ]
 	then
-		# Installing debconf-utils
-		case "${LH_APT}" in
-			apt|apt-get)
-				Chroot "apt-get install --yes debconf-utils"
-				;;
+		# Check dependency
+		Check_package chroot/usr/bin/debconf-set-selections
 
-			aptitude)
-				Chroot "aptitude install --assume-yes debconf-utils"
-				;;
-		esac
+		# Install dependency
+		Install_package
 
 		# Copying preseed
 		cp "${LIVE_PRESEED}" chroot/root/preseed
@@ -67,6 +62,9 @@
 		# Removing preseed file
 		rm -f chroot/root/preseed
 
+		# Remove dependency
+		Remove_package
+
 		# Creating stage file
 		Create_stagefile .stage/chroot_preseed
 	fi