From cfe2c68ac6ca9decffb01da01a5ed8ada3df50b9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 13 Jun 2024 06:30:56 +0200
Subject: Merging debian version 1.5.1-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 ...tstrap-dump-tmpdir-debootstrap-debootstra.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 debian/patches/0001-tests-debootstrap-dump-tmpdir-debootstrap-debootstra.patch

(limited to 'debian/patches')

diff --git a/debian/patches/0001-tests-debootstrap-dump-tmpdir-debootstrap-debootstra.patch b/debian/patches/0001-tests-debootstrap-dump-tmpdir-debootstrap-debootstra.patch
new file mode 100644
index 0000000..d80e282
--- /dev/null
+++ b/debian/patches/0001-tests-debootstrap-dump-tmpdir-debootstrap-debootstra.patch
@@ -0,0 +1,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
+
diff --git a/debian/patches/series b/debian/patches/series
index f54042e..fc211c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-tests-base-files-now-ships-merged-usr-symlinks.patch
 0001-tests-empty-sources.list-only-write-out-etc-apt-sour.patch
+0001-tests-debootstrap-dump-tmpdir-debootstrap-debootstra.patch
-- 
cgit v1.2.3