From 7c746a97e939bfd844acead430d0afee5431d0f5 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Fri, 8 Dec 2006 12:17:24 +0000
Subject: [PATCH] Slightly cleaner handling of mkisofs_opts and _dirs

---
 tools/make_disc_trees | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/make_disc_trees b/tools/make_disc_trees
index 153c6957..d9c1827e 100755
--- a/tools/make_disc_trees
+++ b/tools/make_disc_trees
@@ -177,8 +177,16 @@ do
 			cd $BDIR
 
 		echo "  Placing packages into image $DISKNUM"
-		MKISOFS_OPTS=`cat $BDIR/$DISKNUM.mkisofs_opts` || true
-		MKISOFS_DIRS=`cat $BDIR/$DISKNUM.mkisofs_dirs` || true
+		if [ -e $BDIR/$DISKNUM.mkisofs_opts ] ; then
+		    MKISOFS_OPTS=`cat $BDIR/$DISKNUM.mkisofs_opts`
+		else
+		    unset MKISOFS_OPTS
+		fi
+		if [ -e $BDIR/$DISKNUM.mkisofs_dirs ] ; then
+		    MKISOFS_DIRS=`cat $BDIR/$DISKNUM.mkisofs_dirs`
+		else
+		    unset MKISOFS_DIRS
+		fi
 		SIZE_CHECK="$MKISOFS_CHECK $MKISOFS_OPTS $MKISOFS_DIRS"
 		SIZE=`$SIZE_CHECK $CDDIR`
 		echo "CD #$DISKNUM: size is $SIZE before starting to add packages" >> $LOG