[SCM] live-build branch, debian, updated. debian/3.0_a36-1-3-g0c8bad2
Daniel Baumann
daniel at debian.org
Thu Oct 13 18:04:35 UTC 2011
The following commit has been merged in the debian branch:
commit 0da0a10a95fe39356d4ed36bf28545ee0b415ea7
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Oct 13 17:44:00 2011 +0200
Also strip out source archives from local archive definitions when using --apt-source-archives false.
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 85059da..ee90f76 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
--
live-build
More information about the debian-live-changes
mailing list