From b2dce511561c48c2fea14fdfc8ce7dcbd9a54a85 Mon Sep 17 00:00:00 2001 From: Raphaël Hertzog Date: Wed, 24 Jun 2015 18:15:22 +0200 Subject: Do not pass an empty version in APT::FTPArchive::Release::Version (Closes: #789800). This avoids live-build triggering an apt-ftparchive bug (#693092). --- scripts/build/installer_debian-installer | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 8b09ec08f..1664d831b 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -664,6 +664,9 @@ then mv binary chroot/root eval _VERSION="$`echo RELEASE_${LB_PARENT_DISTRIBUTION}`" + if [ -n "${_VERSION}" ]; then + _LB_APT_VERSION_OPT='-o APT::FTPArchive::Release::Version="'"${_VERSION}"'"' + fi case "${LB_PARENT_DISTRIBUTION}" in sid) @@ -680,7 +683,7 @@ cd /root/binary && apt-ftparchive \ -o APT::FTPArchive::Release::Origin="Debian" \ -o APT::FTPArchive::Release::Label="Debian" \ -o APT::FTPArchive::Release::Suite="${_SUITE}" \ - -o APT::FTPArchive::Release::Version="${_VERSION}" \ + ${_LB_APT_VERSION_OPT} \ -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \ -o APT::FTPArchive::Release::Date="$(date -R)" \ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ -- cgit v1.2.3