From f17ae5a5cb4833ff998bd04a3982abd14feaad02 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Fri, 10 Mar 2017 11:33:59 +0100
Subject: Uniformize COMPONENTS/USE_COMPONENTS handling.

The preliminary fix in 1.0.67 wasn't sufficient, and was extended in
1.0.72 in a different manner. Let's standardize all for loops.
---
 debian/changelog | 3 +++
 functions        | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2bd1aee..2d95e40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ debootstrap (1.0.89) UNRELEASED; urgency=medium
     sbuild, and schroot (Closes: #817236).
   * Add autopkgtest support to test various scenarios.
 
+  [ Cyril Brulebois ]
+  * Uniformize COMPONENTS/USE_COMPONENTS handling.
+
  -- Cyril Brulebois <kibi@debian.org>  Fri, 10 Mar 2017 12:52:11 +0100
 
 debootstrap (1.0.88) unstable; urgency=high
diff --git a/functions b/functions
index 4a4f2f9..e22d4a0 100644
--- a/functions
+++ b/functions
@@ -1034,11 +1034,9 @@ mv_invalid_to () {
 
 setup_apt_sources () {
 	mkdir -p "$TARGET/etc/apt"
-	# Cope with the foreign case where COMPONENTS would be empty:
-	sources_components="${COMPONENTS:-$USE_COMPONENTS}"
 	for m in "$@"; do
 		local cs=""
-		for c in $sources_components; do
+		for c in ${COMPONENTS:-$USE_COMPONENTS}; do
 			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
 			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
 			if [ -e "$pkgdest" ]; then cs="$cs $c"; fi
-- 
cgit v0.12