From 0da0a10a95fe39356d4ed36bf28545ee0b415ea7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 13 Oct 2011 17:44:00 +0200 Subject: Also strip out source archives from local archive definitions when using --apt-source-archives false. --- scripts/build/lb_chroot_archives | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'scripts/build') diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 85059da6f..ee90f764f 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -278,6 +278,12 @@ EOF -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" + + if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] + then + # Strip out source archives + sed "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" + fi fi done fi @@ -834,6 +840,12 @@ EOF -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" + + if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] + then + # Strip out source archives + sed "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" + fi fi done fi -- cgit v1.2.3