[SCM] live-build branch, debian, updated. debian/3.0_a51-1-31-gf271c83

Daniel Baumann daniel at debian.org
Wed Jul 18 21:10:51 UTC 2012


The following commit has been merged in the debian branch:
commit 23bf55a73c75f21dd8964a8b969be3049d4e7358
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 18 17:45:52 2012 +0200

    Applying patch from Steven Shiau <steven at nchc.org.tw> to conditionally copy /etc/apt/secring.gpg* files.

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index fb4a9e8..168b3af 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -538,7 +538,11 @@ EOF
 			then
 				mkdir -p cache/indices.bootstrap
 
-				cp -f chroot/etc/apt/secring.gpg* cache/indices.bootstrap
+				if Find_files chroot/etc/apt/secring.gpg*
+				then
+					cp -f chroot/etc/apt/secring.gpg* cache/indices.bootstrap
+				fi
+
 				cp -rf chroot/etc/apt/trusted.gpg* cache/indices.bootstrap
 
 				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices.bootstrap

-- 
live-build



More information about the debian-live-changes mailing list