diff --git a/debian/changelog b/debian/changelog index 27ebdb7d..60a60a45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.408.54ubuntu1) UNRELEASED; urgency=medium + + * magic-proxy: dump proxy log to stdout on failure (LP: #1847300) + + -- Robert C Jennings Tue, 08 Oct 2019 11:02:08 -0500 + livecd-rootfs (2.408.54) xenial; urgency=medium * Revert exclusion of makedev from buildd chroots, as it turned out not to diff --git a/live-build/auto/build b/live-build/auto/build index 8f15a8b7..7908cc73 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -393,6 +393,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