blob: d80e2828053632da7b88799096bef973078d6366 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From d0c30c70bd7de22a7fc1f281346e7915dfb3d057 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Wed, 12 Jun 2024 11:41:17 +0200
Subject: [PATCH] tests/debootstrap: dump $tmpdir/debootstrap/debootstrap.log
on failure
---
tests/debootstrap | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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"
--
2.39.2
|
