From 1a6a1260e37f70fac654855687c12003a40264d0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jun 2024 18:03:01 +0200 Subject: Adding upstream version 1.5.2. Signed-off-by: Daniel Baumann --- tests/debootstrap | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tests/debootstrap') diff --git a/tests/debootstrap b/tests/debootstrap index 63c217d..9e1709e 100644 --- a/tests/debootstrap +++ b/tests/debootstrap @@ -5,6 +5,12 @@ export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }} tmpdir="$(mktemp -d)" chmod 755 "$tmpdir" -debootstrap "$([ "{{ DIST }}" = oldstable ] && echo --no-merged-usr || echo --merged-usr)" --variant={{ VARIANT }} {{ DIST }} "$tmpdir" {{ MIRROR }} +ret=0 +debootstrap "$([ "{{ DIST }}" = oldstable ] && echo --no-merged-usr || echo --merged-usr)" --variant={{ VARIANT }} {{ DIST }} "$tmpdir" {{ MIRROR }} || ret=$? +if [ "$ret" -ne 0 ]; then + echo "E: debootstrap failed, dumping $tmpdir/debootstrap/debootstrap.log" + cat "$tmpdir/debootstrap/debootstrap.log" + exit 1 +fi tar --sort=name --mtime=@$SOURCE_DATE_EPOCH --clamp-mtime --numeric-owner --one-file-system --xattrs -C "$tmpdir" -c . > "./cache/debian-{{ DIST }}-{{ VARIANT }}.tar" rm -r "$tmpdir" -- cgit v1.2.3