From b92ce0bcc00f29ac40180a734d9e878763ac76a1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 19 Nov 2011 16:46:58 -0200 Subject: Fix --print-debs support when using --foreign param. Closes: #551837. --- debian/changelog | 5 +++++ debootstrap | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c1c246f..0a1345e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ debootstrap (1.0.38) UNRELEASED; urgency=low + [ Joey Hess ] * Improve error message when a decompressor is not available, to indicate which package has been built with bzip today. Closes: #644719 + [ Otavio Salvador ] + * Fix --print-debs support when using --foreign param. Closes: + #551837. + -- Joey Hess Sat, 08 Oct 2011 17:07:53 -0400 debootstrap (1.0.37) unstable; urgency=low diff --git a/debootstrap b/debootstrap index facd1d8..6130829 100755 --- a/debootstrap +++ b/debootstrap @@ -33,6 +33,7 @@ HOST_OS="" KEEP_DEBOOTSTRAP_DIR="" USE_DEBIANINSTALLER_INTERACTION="" SECOND_STAGE_ONLY="" +PRINT_DEBS="" CHROOTDIR="" MAKE_TARBALL="" KEEP_DEBOOTSTRAP_DIR="" @@ -145,7 +146,9 @@ if [ $# != 0 ] ; then shift ;; --foreign) - WHAT_TO_DO="finddebs dldebs first_stage" + if [ "$PRINT_DEBS" != "true" ]; then + WHAT_TO_DO="finddebs dldebs first_stage" + fi shift ;; --second-stage) @@ -169,6 +172,7 @@ if [ $# != 0 ] ; then ;; --print-debs) WHAT_TO_DO="finddebs printdebs kill_target" + PRINT_DEBS=true shift ;; --download-only) -- cgit v0.12