diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | 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 @@ -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 |