[SCM] debian-live/live-helper branch, master, updated. 1.0_a44-1-8-g734762f

[Daniel Baumann]

The following commit has been merged in the master branch:
commit dd470ea575a8b75051708ff591b335b35c6b2df0
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 17 10:39:47 2008 +0200

    Using one single packages cache directory for all chroot packages.

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

-- 
debian-live/live-helper