Making apt calls a bit more consistent over the different scripts.

This commit is contained in:
Daniel Baumann 2011-04-23 17:44:01 +02:00
parent 890a6e5fb3
commit f4370639f9
2 changed files with 4 additions and 3 deletions

View File

@ -139,7 +139,7 @@ case "${1}" in
# them again.
rm -f chroot/var/cache/apt/* > /dev/null 2>&1 || true
rm -f chroot/var/lib/apt/lists/* > /dev/null 2>&1 || true
Chroot chroot "apt-get ${APT_OPTIONS} update"
Apt chroot update
# Creating stage file
Create_stagefile .stage/chroot_apt

View File

@ -287,7 +287,7 @@ EOF
# completed all the indices.
case "${LB_PACKAGE_LISTS}" in
stripped|minimal)
Chroot chroot "apt-get update"
Apt chroot update
;;
esac
@ -435,6 +435,7 @@ EOF
if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
then
Chroot chroot "apt-get ${APT_OPTIONS} update"
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
else # Get fresh indices
@ -480,7 +481,7 @@ EOF
# Installing keyring packages
if [ -n "${LB_KEYRING_PACKAGES}" ]
then
Chroot chroot "apt-get --yes --force-yes install ${LB_KEYRING_PACKAGES}"
Apt chroot "--force-yes install ${LB_KEYRING_PACKAGES}"
Apt chroot update
fi