[SCM] live-helper branch, debian-next, updated. debian/2.0_a15-1-34-g78a44b7

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 78a44b76184acfd27bcd3f413c2f8775cd6c7ab9
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 23 18:30:13 2010 +0200

    Globally using packages cache during runtime of chroot_source (Closes: #586927).

diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 3e82350..413d2f5 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -41,6 +41,9 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
+		# Restoring cache
+		Restore_cache cache/packages_chroot
+
 		# Configure custom sources.list
 		echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
 
@@ -197,9 +200,6 @@ case "${1}" in
 						;;
 				esac
 
-				# Restoring cache
-				Restore_cache cache/packages_chroot
-
 				# Check depends
 				Check_package chroot/usr/bin/apt-ftparchive apt-utils
 
@@ -293,9 +293,6 @@ case "${1}" in
 
 				# Removing depends
 				Remove_package
-
-				# Saving cache
-				Save_cache cache/packages_chroot
 			else
 				Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'."
 			fi
@@ -409,6 +406,9 @@ case "${1}" in
 			fi
 		fi
 
+		# Saving cache
+		Save_cache cache/packages_chroot
+
 		# Creating stage file
 		Create_stagefile .stage/chroot_sources
 		;;

-- 
live-helper