Imported 2.615

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.615) eoan; urgency=medium
+
+  * magic-proxy: dump proxy log to stdout on failure
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  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

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