From 44f99bd88ef35a45461c47255cbfb0cfc05a6dd3 Mon Sep 17 00:00:00 2001 From: dancer Date: Sun, 7 Aug 2005 04:14:48 +0000 Subject: +2005-08-07 Junichi Uekawa + + * debian/control: allow cdebootstrap dependency. + + * testsuite/run-test.sh: complicate the process by testing both + cdebootstrap and debootstrap. + + * pbuilder.8: document --debootstrap + + * pbuilder-checkparams: --debootstrap + + * pbuilder-modules: --debootstrap + + * pbuilder-createbuildenv: unset DEBOOTSTRAPSCRIPT instead of setting + "". The number of parameter given to cdebootstrap changes. + since DEBOOTSTRAPSCRIPT are not supported by cdebootstrap, + Giving cdebootstrap this parameter caused it to fail. + + * pbuilderrc.5: Document DEBOOTSTRAP + + * pbuilderrc (DEBOOTSTRAP): new option. + + * pbuilder-createbuildenv (DEBOOTSTRAPSCRIPT): call ${DEBOOTSTRAP} instead of calling debootstrap directly. + --- pbuilder-createbuildenv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pbuilder-createbuildenv') diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index c474984..6485438 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -45,8 +45,8 @@ if [ ! -d "$BUILDPLACE" ]; then fi $TRAP cleanbuildplace exit -echo " -> running debootstrap" -DEBOOTSTRAPSCRIPT="" +echo " -> running $DEBOOTSTRAP" +unset DEBOOTSTRAPSCRIPT if [ -n "$HOOKDIR" ]; then if [ -f "$HOOKDIR/$DISTRIBUTION" ]; then DEBOOTSTRAPSCRIPT=$(readlink -f $HOOKDIR)"/$DISTRIBUTION" @@ -54,8 +54,8 @@ if [ -n "$HOOKDIR" ]; then fi fi -if ! ( cd "$BUILDPLACE" && debootstrap "${DEBOOTSTRAPOPTS[@]}" "$DISTRIBUTION" . "$MIRRORSITE" "$DEBOOTSTRAPSCRIPT" ) ; then - echo "pbuilder: debootstrap failed" >&2 +if ! ( cd "$BUILDPLACE" && "${DEBOOTSTRAP}" "${DEBOOTSTRAPOPTS[@]}" "$DISTRIBUTION" . "$MIRRORSITE" $DEBOOTSTRAPSCRIPT ) ; then + echo "pbuilder: $DEBOOTSTRAP failed" >&2 exit 1 fi -- cgit v1.2.3