From 7bec127afeb7712cc6715fb27f6f8a7edb4fed5e Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad@0c3.net>
Date: Mon, 5 Dec 2011 15:13:36 -0700
Subject: [PATCH] Guard legacy cloop code

---
 BuildLiveCD      | 22 ++++++++++++----------
 debian/changelog |  6 ++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 0bcddb38..93c37bfe 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -169,17 +169,19 @@ for STE in $SUITES; do
 	done
 
 	for f in ${PUBDIR}${NOW}/livecd.*.cloop-*; do 
-	    target=${f%-*}
-	    if [ ! -f ${target} ]; then
-		for fsbs in 4096:4096 1024:65536; do
-		    if [ -f ${target}-${fsbs} ]; then
-			ln -sf ${target##*/}-${fsbs} ${target}
-			break
-		    fi
-		done
+	    if [ -f $f ]; then
+		target=${f%-*}
 		if [ ! -f ${target} ]; then
-		    best=$(ls -ld ${target}-* | sort -k5,5n| awk '{print $NF; quit}')
-		    ln -sf ${best##*/} ${target}
+		    for fsbs in 4096:4096 1024:65536; do
+			if [ -f ${target}-${fsbs} ]; then
+			    ln -sf ${target##*/}-${fsbs} ${target}
+			    break
+			fi
+		    done
+		    if [ ! -f ${target} ]; then
+			best=$(ls -ld ${target}-* | sort -k5,5n| awk '{print $NF; quit}')
+			ln -sf ${best##*/} ${target}
+		    fi
 		fi
 	    fi
 	done
diff --git a/debian/changelog b/debian/changelog
index 957d9109..fab6470b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.46) UNRELEASED; urgency=low
+
+  * Guard legacy cloop code in a [ -f ], so it stops failing.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 05 Dec 2011 15:12:36 -0700
+
 livecd-rootfs (2.45) precise; urgency=low
 
   * Change default suite to precise (better late than never?)