[Debian-live-changes] r2535 - in dists/trunk/live-helper: docs functions

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-19 21:49:04 +0000 (Thu, 19 Jul 2007)
New Revision: 2535

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/package.sh
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-19 21:46:18 UTC (rev 2534)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-19 21:49:04 UTC (rev 2535)
@@ -9,6 +9,8 @@
 	* functions/defaults.sh, package.sh, helpers/lh_config,
 	  lh_binary_rootfs, lh_binary_encryption, lh_binary_chroot:
 	  - Partially implemented support for non-chrooted build.
+	* helpers/lh_binary_rootfs:
+	  - Updated squashfs-tools package check.
 
 2007-07-15  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-helper/functions/package.sh
===================================================================
--- dists/trunk/live-helper/functions/package.sh	2007-07-19 21:46:18 UTC (rev 2534)
+++ dists/trunk/live-helper/functions/package.sh	2007-07-19 21:49:04 UTC (rev 2535)
@@ -34,7 +34,7 @@
 
 Install_package ()
 {
-	if [ -n "${PACKAGES}" ]
+	if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
 	then
 		case "${LH_APT}" in
 			apt|apt-get)
@@ -50,7 +50,7 @@
 
 Remove_package ()
 {
-	if [ -n "${PACKAGES}" ]
+	if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
 	then
 		case "${LH_APT}" in
 			apt|apt-get)