[SCM] live-build branch, debian-next, updated. debian/3.0_a30-1-18-g805fc35

Daniel Baumann daniel at debian.org
Wed Sep 7 13:52:42 UTC 2011


The following commit has been merged in the debian-next branch:
commit 805fc35877788c121f00a9904dfb5c090496c0d9
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 15:52:23 2011 +0200

    Improving messages when saving and restoring stage caches (Closes: #589728).

diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/lb_bootstrap_cache
index ce8cad0..86cb18f 100755
--- a/scripts/build/lb_bootstrap_cache
+++ b/scripts/build/lb_bootstrap_cache
@@ -27,14 +27,14 @@ Set_defaults
 # Check architecture
 Check_crossarchitectures
 
-Echo_message "Begin caching bootstrap stage..."
-
 for STAGE in ${LB_CACHE_STAGES}
 do
 	if [ "${STAGE}" = "bootstrap" ]
 	then
 		case "${1}" in
 			restore)
+				Echo_message "Restoring bootstrap stage from cache..."
+
 				# Checking stage file
 				Check_stagefile .stage/bootstrap_cache.restore
 
@@ -66,6 +66,8 @@ do
 				;;
 
 			save)
+				Echo_message "Saving bootstrap stage to cache..."
+
 				# Checking stage file
 				Check_stagefile .stage/bootstrap_cache.save
 
diff --git a/scripts/build/lb_chroot_cache b/scripts/build/lb_chroot_cache
index bca88cd..3ad07df 100755
--- a/scripts/build/lb_chroot_cache
+++ b/scripts/build/lb_chroot_cache
@@ -24,14 +24,14 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-Echo_message "Begin caching chroot stage..."
-
 for STAGE in ${LB_CACHE_STAGES}
 do
 	if [ "${STAGE}" = "chroot" ]
 	then
 		case "${1}" in
 			restore)
+				Echo_message "Restoring chroot stage from cache..."
+
 				# Checking stage file
 				Check_stagefile .stage/chroot_cache.restore
 
@@ -62,6 +62,8 @@ do
 				;;
 
 			save)
+				Echo_message "Saving chroot stage to cache..."
+
 				# Checking stage file
 				Check_stagefile .stage/chroot_cache.save
 

-- 
live-build



More information about the debian-live-changes mailing list