From 718f797cef0fb766b6f7cfa1d34b617ad047dbc5 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 9 Sep 2011 10:56:42 +0200
Subject: fix bashism (local outside function) and releasefile creation in
 testcases

---
 test/integration/framework | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index 322cf2875..a2e71760e 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -513,6 +513,7 @@ buildaptarchivefromfiles() {
 # can be overridden by testcases for their pleasure
 getcodenamefromsuite() { echo -n "$1"; }
 getreleaseversionfromsuite() { true; }
+getlabelfromsuite() { true; }
 
 generatereleasefiles() {
 	# $1 is the Date header and $2 is the ValidUntil header to be set
@@ -526,13 +527,17 @@ generatereleasefiles() {
 			local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
 			local CODENAME="$(getcodenamefromsuite $SUITE)"
 			local VERSION="$(getreleaseversionfromsuite $SUITE)"
+			local LABEL="$(getlabelfromsuite $SUITE)"
 			if [ -n "$VERSION" ]; then
-				VERSION="-o APT::FTPArchive::Release::Version='${VERSION}'"
+				VERSION="-o APT::FTPArchive::Release::Version=${VERSION}"
+			fi
+			if [ -n "$LABEL" ]; then
+				LABEL="-o APT::FTPArchive::Release::Label=${LABEL}"
 			fi
 			aptftparchive -qq release $dir \
 				-o APT::FTPArchive::Release::Suite="${SUITE}" \
 				-o APT::FTPArchive::Release::Codename="${CODENAME}" \
-				-o APT::FTPArchive::Release::Label="Testcases" \
+				${LABEL} \
 				${VERSION} \
 					| sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
 			if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
-- 
cgit v1.2.3-70-g09d2