From 15d4db023888b7035d54972413caa71ccc20ef8b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 6 Sep 2013 11:48:25 +0100 Subject: [PATCH] Import patches-unapplied version 2.183 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 3fc5871d18b52dabf61f149d3e239c0074e17347 New changelog entries: * Make 60-install-click.chroot more verbose, in an attempt to figure out why this doesn't work in the datacentre. --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67ebbf02..2b005f9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.183) saucy; urgency=low + + * Make 60-install-click.chroot more verbose, in an attempt to figure out + why this doesn't work in the datacentre. + + -- Colin Watson Fri, 06 Sep 2013 11:48:25 +0100 + livecd-rootfs (2.182) saucy; urgency=low * Log the hostname at the start of the build. diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index 74928239..d8379642 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -1,6 +1,6 @@ #!/bin/sh -set -e +set -ex echo "Setting up click packages" @@ -22,7 +22,8 @@ tmpdir="$(mktemp -d)" cleanup () { rm -rf "$tmpdir"; } trap cleanup EXIT -for package in $(wget -qO- "$click_list") +wget --no-verbose -O "$tmpdir/click_list" "$click_list" +for package in $(cat "$tmpdir/click_list") do echo "Setting up $package" wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"