diff options
| author | Colin Watson <cjwatson@debian.org> | 2015-07-28 13:32:13 (GMT) |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2015-07-28 13:32:13 (GMT) |
| commit | e24e4b006736734e20cc66398099b94dd4e5cb90 (patch) | |
| tree | 64298e5d9f40556f1a7119503393a5c8e5edca09 | |
| parent | c298ef1196de6d633c995ca85f2d12c65d5b2578 (diff) | |
| download | debootstrap-e24e4b006736734e20cc66398099b94dd4e5cb90.zip debootstrap-e24e4b006736734e20cc66398099b94dd4e5cb90.tar.gz debootstrap-e24e4b006736734e20cc66398099b94dd4e5cb90.tar.bz2 | |
Fix resolve_deps and setup_available to work in the --foreign case (closes: #757819, LP: #1450980).
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | functions | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4fbdf33..12a2eb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ debootstrap (1.0.72) UNRELEASED; urgency=medium [ Iain Lane ] * Add (Ubuntu) wily as a symlink to gutsy (closes: #787117). + [ Colin Watson ] + * Fix resolve_deps and setup_available to work in the --foreign case + (closes: #757819, LP: #1450980). + -- Colin Watson <cjwatson@debian.org> Tue, 28 Jul 2015 13:42:44 +0100 debootstrap (1.0.71) unstable; urgency=medium @@ -1255,14 +1255,14 @@ resolve_deps () { local ALLPKGS2=""; while [ "$PKGS" != "" ]; do local NEWPKGS="" - for c in $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" "$m1" "$path")" NEWPKGS="$NEWPKGS $("$PKGDETAILS" GETDEPS "$pkgdest" $PKGS)" done PKGS=$(echo "$PKGS $NEWPKGS" | tr ' ' '\n' | sort | uniq) local REALPKGS="" - for c in $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" "$m1" "$path")" REALPKGS="$REALPKGS $("$PKGDETAILS" PKGS REAL "$pkgdest" $PKGS | sed -n 's/ .*REAL.*$//p')" @@ -1278,7 +1278,7 @@ resolve_deps () { setup_available () { local m1="${MIRRORS%% *}" - for c in $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" "$m1" "$path")" # XXX: What if a package is in more than one component? |