summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-04-17 10:39:47 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:32 +0100
commitcc3c1ff10d0f844ce408e41449da57045a9004a1 (patch)
tree87838eec76fbaabae05fcf0720f6eed9557cd2c9
parent7bcdcf7f059a6ef9895d0089df254b0ea8f413b9 (diff)
downloadlive-build-cc3c1ff10d0f844ce408e41449da57045a9004a1.zip
live-build-cc3c1ff10d0f844ce408e41449da57045a9004a1.tar.gz
Using one single packages cache directory for all chroot packages.
-rwxr-xr-xhelpers/lh_chroot_install-packages4
-rwxr-xr-xhelpers/lh_chroot_localization4
-rwxr-xr-xhelpers/lh_chroot_tasks4
3 files changed, 6 insertions, 6 deletions
diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages
index dad074b..469d0a2 100755
--- a/helpers/lh_chroot_install-packages
+++ b/helpers/lh_chroot_install-packages
@@ -45,7 +45,7 @@ Create_lockfile .lock
if [ -e chroot/root/chroot_packages ] && [ -s chroot/root/chroot_packages ]
then
# Restoring cache
- Restore_cache cache/packages_packages
+ Restore_cache cache/packages_chroot
# Installing packages
case "${LH_APT}" in
@@ -61,7 +61,7 @@ then
rm -f chroot/root/chroot_packages
# Saving cache
- Save_cache cache/packages_packages
+ Save_cache cache/packages_chroot
# Creating stage file
Create_stagefile .stage/chroot_install-packages
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index 941a5af..c4f4f45 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -638,13 +638,13 @@ then
Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
# Restoring cache
- Restore_cache cache/packages_localization
+ Restore_cache cache/packages_chroot
# Installing packages
Install_package
# Saving cache
- Save_cache cache/packages_localization
+ Save_cache cache/packages_chroot
# Creating stage file
Create_stagefile .stage/chroot_localization
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index b554783..9d3a15b 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -45,7 +45,7 @@ Create_lockfile .lock
if [ -n "${LH_TASKS}" ] && [ "${LH_TASKS}" != "none" ]
then
# Restoring cache
- Restore_cache cache/packages_tasks
+ Restore_cache cache/packages_chroot
# Checking depends
case "${LH_TASKSEL}" in
@@ -79,7 +79,7 @@ then
Remove_package
# Saving cache
- Save_cache cache/packages_tasks
+ Save_cache cache/packages_chroot
# Creating stage file
Create_stagefile .stage/chroot_tasks