[SCM] live-build branch, debian-next, updated. debian/3.0_a2-1-4-g1be3361

Daniel Baumann daniel at debian.org
Sun Sep 26 21:07:45 UTC 2010


The following commit has been merged in the debian-next branch:
commit 1be3361bed064f8e53f79ba8fc75a3436318fa12
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 26 23:00:52 2010 +0200

    Avoid using bashism when handling codename/suite mapping for debian-installer release file.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 5dfa525..b61b136 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -589,11 +589,21 @@ then
 
 	eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
 
+	case "${LB_DISTRIBUTION}" in
+		sid)
+			_SUITE="unstable"
+			;;
+
+		*)
+			_SUITE="${LB_DISTRIBUTION}"
+			;;
+	esac
+
 cat > chroot/binary.sh << EOF
 cd /root/binary && apt-ftparchive \
 	-o APT::FTPArchive::Release::Origin="Debian" \
 	-o APT::FTPArchive::Release::Label="Debian" \
-	-o APT::FTPArchive::Release::Suite="${LB_DISTRIBUTION/sid/unstable}" \
+	-o APT::FTPArchive::Release::Suite="${_SUITE}" \
 	-o APT::FTPArchive::Release::Version="${_VERSION}" \
 	-o APT::FTPArchive::Release::Codename="${LB_DISTRIBUTION}" \
 	-o APT::FTPArchive::Release::Date="$(date -R)" \

-- 
live-build



More information about the debian-live-changes mailing list