From 339ee7a89b7f9e0755090a1c764e41a4c5b172ad Mon Sep 17 00:00:00 2001 From: dancer Date: Mon, 10 Mar 2003 11:01:01 +0000 Subject: + * debian/rules: add check target for build. + + * Makefile (check): add check target to makefile, to see if there is + any syntax error. + + * pbuilder-updatebuildenv: support --preserve-buildplace + apply things from + Daniel Schepler + + * pbuilder-satisfydepends: support --preserve-buildplace + support Format: field. + + * pbuilder-modules (pbuilder-options): support --preserve-buildplace + + * pbuilder-buildpackage (PACKAGENAME): support --preserve-buildplace + + * pbuilder-buildpackage-funcs: support --preserve-buildplace + + * pbuilder-createbuildenv (DEBOOTSTRAPSCRIPT): support --preserve-buildplace + + * pbuilder-checkparams (PRESERVE_BUILDPLACE): add PRESERVE_BUILDPLACE + + * pbuilder.8: update docs to add --preserve-buildplace + --- pbuilder-buildpackage-funcs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pbuilder-buildpackage-funcs') diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 04bef48..cac6321 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -31,14 +31,22 @@ function copydsc () { } function checkbuilddep () { + # call satisfydepends local BUILDOPT="--binary-all" case "${BINARY_ARCH}" in yes) BUILDOPT="--binary-arch";; *) ;; esac - if ! /usr/lib/pbuilder/pbuilder-satisfydepends --control "$BUILDPLACE/"tmp/buildd/*/debian/control --chroot "$BUILDPLACE" "${BUILDOPT}" ; then + if /usr/lib/pbuilder/pbuilder-satisfydepends --control "$1" --chroot "$BUILDPLACE" "${BUILDOPT}" ; then + : + else + # If asked to preserve the build place, and pbuilder-satisfydepends + # didn't taint it, then don't clean it when exiting. + if [ $? -eq 2 -a "${PRESERVE_BUILDPLACE}" = "yes" ]; then + trap umountproc exit + fi echo "E: pbuilder-satisfydepends failed." >&2 - exit 1 + exit 2 fi # install extra packages to the chroot if [ -n "$EXTRAPACKAGES" ]; then -- cgit v1.2.3