From 8cb442c3e8ecf0daba1670d30c4ff77c3cbe4860 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Thu, 3 Oct 2019 21:32:26 -0500 Subject: [PATCH] magic-proxy: dump proxy log to stdout on failure When we encounter a failure in 'lb binary' the launchpad builders can only surface the build output from stdout. If the binary hook failure implicates the archive we can not determine fault without the apt proxy log. This patch will dump the proxy log to stdout to aid in debugging these failures. --- debian/changelog | 6 ++++++ live-build/auto/build | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index d97f5e49..aa460ae9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.615) UNRELEASED; urgency=medium + + * magic-proxy: dump proxy log to stdout on failure + + -- Robert C Jennings Fri, 04 Oct 2019 10:24:18 -0500 + livecd-rootfs (2.614) eoan; urgency=medium * 002-add-foreign-kernel.chroot_early: enable amd64 as a foreign arch on diff --git a/live-build/auto/build b/live-build/auto/build index 5606dfcc..24a5536b 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -460,6 +460,12 @@ EOF if [ -e binary.success ]; then rm -f binary.success else + # Dump the magic-proxy log to stdout on failure to aid debugging + if [ -f /build/livecd.magic-proxy.log ] ; then + echo "================= Magic proxy log (start) =================" + cat /build/livecd.magic-proxy.log + echo "================== Magic proxy log (end) ==================" + fi exit 1 fi