diff --git a/debian/changelog b/debian/changelog index 093b9093..86484753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.525.30ubuntu1) UNRELEASED; urgency=medium + + * magic-proxy: dump proxy log to stdout on failure (LP: #1847300) + + -- Robert C Jennings Tue, 08 Oct 2019 11:00:07 -0500 + livecd-rootfs (2.525.30) bionic; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/build b/live-build/auto/build index 6c7a0105..d57eaef3 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -489,6 +489,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