diff --git a/debian/changelog b/debian/changelog index 1a4df37d..f1aaccee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.578.9) UNRELEASED; urgency=medium + + * magic-proxy: dump proxy log to stdout on failure (LP: #1847300) + + -- Robert C Jennings Tue, 08 Oct 2019 10:57:31 -0500 + livecd-rootfs (2.578.8) disco; urgency=medium * ubuntu-cpc: Only produce explicitly specified artifacts (LP: #1837254) diff --git a/live-build/auto/build b/live-build/auto/build index e87a4953..2c755780 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -440,6 +440,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