From 6a206425e8400fddb362c013d70024e834e8b1a4 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 4 Dec 2012 12:07:51 +0100
Subject: Adding support for local apt conf.d snippets in archive definitions
 (Closes: #685791).

---
 scripts/build/chroot_archives | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'scripts/build/chroot_archives')

diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 27c8acc83..da8417ef0 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -229,6 +229,15 @@ EOF
 					fi
 				done
 
+				# Adding apt configuration (chroot)
+				for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.chroot"
+				do
+					if [ -e "${_FILE}" ]
+					then
+						cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
+					fi
+				done
+
 				# Adding apt preferences (chroot)
 				for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.chroot"
 				do
@@ -271,6 +280,15 @@ EOF
 			fi
 		done
 
+		# Adding local apt configuration (chroot)
+		for FILE in config/archives/*.conf config/archives/*.conf.chroot
+		do
+			if [ -e "${FILE}" ]
+			then
+				cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)
+			fi
+		done
+
 		# Adding local apt preferences (chroot)
 		for FILE in config/archives/*.pref config/archives/*.pref.chroot
 		do
@@ -742,6 +760,7 @@ EOF
 		fi
 
 		# probably too bold, needs refinment (FIXME)
+		rm -f chroot/etc/apt/conf.d/*
 		rm -f chroot/etc/apt/preferences.d/*
 
 		# Configure third-party archives
@@ -771,6 +790,15 @@ EOF
 					fi
 				done
 
+				# Adding apt configuration (binary)
+				for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.binary"
+				do
+					if [ -e "${_FILE}" ]
+					then
+						cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
+					fi
+				done
+
 				# Adding apt preferences (binary)
 				for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.binary"
 				do
@@ -813,6 +841,15 @@ EOF
 			fi
 		done
 
+		# Adding local apt configuration (binary)
+		for FILE in config/archives/*.conf config/archives/*.conf.binary
+		do
+			if [ -e "${FILE}" ]
+			then
+				cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .binary)
+			fi
+		done
+
 		# Adding local apt preferences (binary)
 		for FILE in config/archives/*.pref config/archives/*.pref.binary
 		do
-- 
cgit v1.2.3