[SCM] debian-live branch, master, updated. 1.0.0-1-3-ge5b24d3

Daniel Baumann daniel at debian.org
Mon Aug 25 10:14:05 UTC 2008


The following commit has been merged in the master branch:
commit e5b24d3ecc1f51772b8374f0cae47e0fef040429
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 25 12:01:37 2008 +0200

    Using internal prefix for PACKAGES variable in function/packages.sh (Closes: #468900).

diff --git a/functions/packages.sh b/functions/packages.sh
index 034f571..ed1bdc4 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -18,7 +18,7 @@ Check_package ()
 
 	case "${INSTALL_STATUS}" in
 		1)
-			PACKAGES="${PACKAGES} ${PACKAGE}"
+			_LH_PACKAGES="${_LH_PACKAGES} ${PACKAGE}"
 			;;
 
 		2)
@@ -30,15 +30,15 @@ Check_package ()
 
 Install_package ()
 {
-	if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
+	if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
 	then
 		case "${LH_APT}" in
 			apt|apt-get)
-				Chroot "apt-get install -o APT::Install-Recommends=false --yes ${PACKAGES}"
+				Chroot "apt-get install -o APT::Install-Recommends=false --yes ${_LH_PACKAGES}"
 				;;
 
 			aptitude)
-				Chroot "aptitude install --without-recommends --assume-yes ${PACKAGES}"
+				Chroot "aptitude install --without-recommends --assume-yes ${_LH_PACKAGES}"
 				;;
 		esac
 	fi
@@ -46,15 +46,15 @@ Install_package ()
 
 Remove_package ()
 {
-	if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
+	if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
 	then
 		case "${LH_APT}" in
 			apt|apt-get)
-				Chroot "apt-get remove --purge --yes ${PACKAGES}"
+				Chroot "apt-get remove --purge --yes ${_LH_PACKAGES}"
 				;;
 
 			aptitude)
-				Chroot "aptitude purge --assume-yes ${PACKAGES}"
+				Chroot "aptitude purge --assume-yes ${_LH_PACKAGES}"
 				;;
 		esac
 	fi

-- 
debian-live



More information about the debian-live-changes mailing list