manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not pass an empty version in APT::FTPArchive::Release::Version (Closes: #789800). 

This avoids live-build triggering an apt-ftparchive bug (#693092).
This commit is contained in:
Raphaël Hertzog 2015-06-24 18:15:22 +02:00 committed by Daniel Baumann
parent f7d2e5a84b
commit b2dce51156
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/build/installer_debian-installer
View File

@ -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}" \