diff options
| author | Raphaël Hertzog <buxy@kali.org> | 2015-06-24 18:15:22 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-06-24 20:13:34 +0200 |
| commit | b2dce511561c48c2fea14fdfc8ce7dcbd9a54a85 (patch) | |
| tree | e959068d4b006de2c7f099ae6dc3ccb62940daa2 /scripts | |
| parent | f7d2e5a84b62f53ae488c602854bf63999fc8f93 (diff) | |
| download | vyos-live-build-b2dce511561c48c2fea14fdfc8ce7dcbd9a54a85.tar.gz vyos-live-build-b2dce511561c48c2fea14fdfc8ce7dcbd9a54a85.zip | |
Do not pass an empty version in APT::FTPArchive::Release::Version (Closes: #789800).
This avoids live-build triggering an apt-ftparchive bug (#693092).
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/installer_debian-installer | 5 |
1 files changed, 4 insertions, 1 deletions
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}" \ |