[SCM] debian-live branch, master, updated. 1.0_a48-1-78-gf0f7acf
Chris Lamb
chris at chris-lamb.co.uk
Thu Aug 14 00:51:10 UTC 2008
The following commit has been merged in the master branch:
commit a69cdc8d970f4b13eefd368ed67106fb85aa36a4
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