[SCM] live-helper branch, debian-next, updated. debian/2.0_a8-1-19-g28b9c32

Daniel Baumann daniel at debian.org
Sun Mar 7 12:26:15 UTC 2010


The following commit has been merged in the debian-next branch:
commit 28b9c32aa30a2ff29da07ffe558c87d56f6045c1
Author: Steven Shiau <steven at nchc.org.tw>
Date:   Sun Mar 7 13:21:27 2010 +0100

    Fixing build failure with indices caching.

diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index cb046d9..87db111 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -254,7 +254,7 @@ case "${1}" in
 
 			if Find_files cache/indices_bootstrap/trusted.gpg*
 			then
-				cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
+				cp -rf cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
 			fi
 
 			if [ -f cache/indices_bootstrap/pkgcache.bin ]
@@ -332,7 +332,7 @@ case "${1}" in
 				mkdir -p cache/indices_bootstrap
 
 				cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
-				cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
+				cp -rf chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
 
 				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
 

-- 
live-helper



More information about the debian-live-changes mailing list