From d0bd7bc265748628355fdff835ffcb830e61551e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 25 Aug 2008 12:01:37 +0200
Subject: Using internal prefix for PACKAGES variable in function/packages.sh
(Closes: #468900).
---
functions/packages.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
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
--
cgit v1.0