[SCM] live-helper branch, debian-next, updated. debian/2.0_a6-1-10-g12e9b7e

Daniel Baumann daniel at debian.org
Sun Feb 14 15:04:38 UTC 2010


The following commit has been merged in the debian-next branch:
commit 12e9b7e85d625373ce1be034746521f8a39a3280
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 14 16:00:48 2010 +0100

    Also using sources.list snipplets for local packages just as for the other repositories (Closes: #569619).

diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 81c0268..6edc3ac 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -218,10 +218,8 @@ case "${1}" in
 					fi
 				fi
 
-				# Add to sources.list
-				echo "" >> chroot/etc/apt/sources.list
-				echo "# Local packages" >> chroot/etc/apt/sources.list
-				echo "deb file:/root/local-packages ./" >> chroot/etc/apt/sources.list
+				# Add to sources.list.d
+				echo "deb file:/root/local-packages ./" > chroot/etc/apt/sources.list.d/local-packages.list
 
 				# Removing depends
 				Remove_package
@@ -448,6 +446,7 @@ case "${1}" in
 		fi
 
 		# Remove local package repository
+		rm -f chroot/etc/apt/sources.list.d/local-packages.list
 		rm -rf chroot/root/local-packages
 
 		# Remove local packages key if it exists

-- 
live-helper



More information about the debian-live-changes mailing list