[SCM] debian-live branch, master, updated. 1.0_a48-1-77-gb07cae2
Chris Lamb
chris at chris-lamb.co.uk
Thu Aug 14 00:53:51 UTC 2008
The following commit has been merged in the master branch:
commit ecf6e30e265b843cc8180b819dfb999d0bda4b9f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Thu Aug 14 01:38:24 2008 +0100
Prevent (harmless) duplicate entries appearing in /etc/apt/preferences
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 8564bf4..766875f 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -114,6 +114,11 @@ case "${1}" in
if Find_files config/chroot_local-packages/*.deb
then
+ if [ ! -f config/chroot_apt/preferences ] && [ "${1}" = "install-binary" ]
+ then
+ rm -f chroot/etc/apt/preferences
+ fi
+
echo >> chroot/etc/apt/preferences
echo "Package: *" >> chroot/etc/apt/preferences
echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences
--
debian-live
More information about the debian-live-changes
mailing list