X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/002b1bc46b18e9d309d337ddb15a6ccdfb6c9dde..1dd20368486820efb6ef4476ad739e967174bec4:/test/integration/framework

diff --git a/test/integration/framework b/test/integration/framework
index 8b85cb71e..04f54c8e2 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -388,12 +388,8 @@ EOF
 		TEST_DEFAULT_GROUP="$USER"
 	fi
 
-        # Acquire::AllowInsecureRepositories=false is not yet the default
-        # but we want it to be the default soon
-        configallowinsecurerepositories "false";
-
 	# cleanup the environment a bit
-        # prefer our apt binaries over the system apt binaries
+	# prefer our apt binaries over the system apt binaries
 	export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
 	export LC_ALL=C.UTF-8
 	unset LANGUAGE APT_CONFIG
@@ -506,12 +502,6 @@ int execvp(const char *file, char *const argv[]) {
 EOF
 	testsuccess --nomsg gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
 }
-
-configallowinsecurerepositories() {
-    echo "Acquire::AllowInsecureRepositories \"$1\";" >  rootdir/etc/apt/apt.conf.d/allow-insecure-repositories.conf
-
-}
-
 configcompression() {
 	while [ -n "$1" ]; do
 		case "$1" in
@@ -784,7 +774,7 @@ EOF
 	for DIST in $(find ./pool/ -maxdepth 1 -name '*.pkglist' -type f | cut -d'/' -f 3 | cut -d'.' -f 1 | sort | uniq); do
 		cat <<EOF
 tree "dists/$DIST" {
-	Architectures "$ARCHS source";
+	Architectures "$ARCHS all source";
 	FileList "${DIST}.\$(SECTION).pkglist";
 	SourceFileList "${DIST}.\$(SECTION).srclist";
 	Sections "$(find ./pool/ -maxdepth 1 -name "${DIST}.*.pkglist" -type f | cut -d'/' -f 3 | cut -d'.' -f 2 | sort | uniq | tr '\n' ' ')";
@@ -826,7 +816,7 @@ insertpackage() {
 			continue
 		fi
 		for arch in $(getarchitecturesfromcommalist "$ARCH"); do
-			if [ "$arch" = 'all' -o "$arch" = 'none' ]; then
+			if [ "$arch" = 'none' ]; then
 				ARCHS="$(getarchitectures)"
 			else
 				ARCHS="$arch"
@@ -972,6 +962,7 @@ getcodenamefromsuite() {
 getreleaseversionfromsuite() { true; }
 getlabelfromsuite() { true; }
 getoriginfromsuite() { true; }
+getarchitecturesfromreleasefile() { echo "all $(getarchitectures)"; }
 
 aptftparchiverelease() {
 	aptftparchive -qq release "$@" | sed -e '/0 Release$/ d' # remove the self reference
@@ -979,9 +970,12 @@ aptftparchiverelease() {
 generatereleasefiles() {
 	# $1 is the Date header and $2 is the ValidUntil header to be set
 	# both should be given in notation date/touch can understand
+	local DATE="$1"
+	local VALIDUNTIL="$2"
 	msgninfo "\tGenerate Release files… "
 	if [ -e aptarchive/dists ]; then
 		for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
+			local ARCHITECTURES="$(getarchitecturesfromreleasefile "$dir")"
 			local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
 			local CODENAME="$(getcodenamefromsuite $SUITE)"
 			local VERSION="$(getreleaseversionfromsuite $SUITE)"
@@ -996,9 +990,13 @@ generatereleasefiles() {
 			if [ -n "$ORIGIN" ]; then
 				ORIGIN="-o APT::FTPArchive::Release::Origin=${ORIGIN}"
 			fi
+			if [ -n "$ARCHITECTURES" ]; then
+				ARCHITECTURES="-o APT::FTPArchive::Release::Architectures=${ARCHITECTURES}"
+			fi
 			aptftparchiverelease "$dir" \
 				-o APT::FTPArchive::Release::Suite="${SUITE}" \
 				-o APT::FTPArchive::Release::Codename="${CODENAME}" \
+				${ARCHITECTURES} \
 				${LABEL} \
 				${ORIGIN} \
 				${VERSION} \
@@ -1011,15 +1009,15 @@ NotAutomatic: yes' "$dir/Release"
 	else
 		aptftparchiverelease ./aptarchive > aptarchive/Release
 	fi
-	if [ -n "$1" -a "$1" != "now" ]; then
+	if [ -n "$DATE" -a "$DATE" != "now" ]; then
 		for release in $(find ./aptarchive -name 'Release'); do
-			sed -i "s/^Date: .*$/Date: $(date -d "$1" '+%a, %d %b %Y %H:%M:%S %Z')/" "$release"
-			touch -d "$1" "$release"
+			sed -i "s/^Date: .*$/Date: $(date -d "$DATE" '+%a, %d %b %Y %H:%M:%S %Z')/" "$release"
+			touch -d "$DATE" "$release"
 		done
 	fi
-	if [ -n "$2" ]; then
+	if [ -n "$VALIDUNTIL" ]; then
 		sed -i "/^Date: / a\
-Valid-Until: $(date -d "$2" '+%a, %d %b %Y %H:%M:%S %Z')" $(find ./aptarchive -name 'Release')
+Valid-Until: $(date -d "$VALIDUNTIL" '+%a, %d %b %Y %H:%M:%S %Z')" $(find ./aptarchive -name 'Release')
 	fi
 	msgdone "info"
 }