From d471604c00c0b2b84a346fa82f67f400564a0e80 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 22 Jul 2009 10:29:47 -0600 Subject: [PATCH] * Make the sort file fetch a no-op for now, since the old URL was hanging the builds, and we don't actually HAVE sort files. If that ever changes, we can undo this. --- debian/changelog | 8 ++++++++ livecd.sh | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c55b3aad..d16c9d49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (0.88) UNRELEASED; urgency=low + + * Make the sort file fetch a no-op for now, since the old URL was + hanging the builds, and we don't actually HAVE sort files. If + that ever changes, we can undo this. + + -- Adam Conrad Wed, 22 Jul 2009 10:22:51 -0600 + livecd-rootfs (0.87) karmic; urgency=low [ Timo Aaltonen ] diff --git a/livecd.sh b/livecd.sh index d5dcbe18..96bf75cb 100755 --- a/livecd.sh +++ b/livecd.sh @@ -553,7 +553,8 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse livefs_squash() { squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${TARGETARCH}" - if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then + #if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then + if false; then echo "Using the squashfs sort list from ${squashsort}." else echo "Unable to fetch squashfs sort list; using a blank list."