[SCM] debian-live branch, master, updated. 1.0_a48-1-98-gea96223

Daniel Baumann daniel at debian.org
Sat Aug 23 22:49:28 UTC 2008


The following commit has been merged in the master branch:
commit ecd88168f3829e1fc2d6178d61a28458a15ef419
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 14 01:39:03 2008 +0100

    Generate Release file for chroot_local-packages when APT_SECURE is disabled.
    
    This was preventing the pinning mechanism to work when it security was
    disabled.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 866be3e..681d721 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -116,13 +116,13 @@ case "${1}" in
 				echo "cd /root/local-packages && apt-ftparchive packages . > Packages" | Chroot sh
 				gzip -9 -c chroot/root/local-packages/Packages > chroot/root/local-packages/Packages.gz
 
+				# Generate Release
+				echo "cd /root/local-packages && apt-ftparchive \
+					-o APT::FTPArchive::Release::Origin=chroot_local-packages \
+					release . > Release" | Chroot sh
+
 				if [ "${LH_APT_SECURE}" = "enabled" ]
 				then
-					# Generate Release
-					echo "cd /root/local-packages && apt-ftparchive \
-						-o APT::FTPArchive::Release::Origin=chroot_local-packages \
-						release . > Release" | Chroot sh
-
 					_LH_DOTGNUPG_EXISTED=0
 					if [ -d chroot/root/.gnupg ]
 					then

-- 
debian-live



More information about the debian-live-changes mailing list