From 4d9c77d20e517c5dc195183978a2c91d9ba577de Mon Sep 17 00:00:00 2001
From: Jan Blunck <jblunck@vyatta.com>
Date: Tue, 17 Sep 2013 13:28:00 +0200
Subject: Remove chroot-only configured apt sources in chroot_archives remove.

If an archive is configured with *.chroot extension remove it when
deconfiguring chroot/etc/apt/sources.list.d directory.
---
 scripts/build/chroot_archives | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'scripts/build')

diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 95b47c38b..226bad652 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -677,6 +677,15 @@ EOF
 		rm -f chroot/etc/apt/conf.d/*
 		rm -f chroot/etc/apt/preferences.d/*
 
+		# Removing chroot-only apt sources
+		for FILE in config/archives/*.list.chroot
+		do
+			if [ -e "${FILE}" ]
+			then
+				rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
+			fi
+		done
+
 		# Adding local apt sources (binary)
 		for FILE in config/archives/*.list config/archives/*.list.binary
 		do
-- 
cgit v1.2.3