[SCM] Debian Live build scripts branch, master, updated. debian/1.0.5-1-5-g8ce0684

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 8ce0684f66ce0c71b9e336906dea66401b968e8f
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date:   Fri Jun 19 08:17:51 2009 +0200

    Simplifying template precedence.

diff --git a/functions/templates.sh b/functions/templates.sh
index 846034b..eec52f3 100755
--- a/functions/templates.sh
+++ b/functions/templates.sh
@@ -11,23 +11,14 @@ Check_templates ()
 {
 	PACKAGE="${1}"
 
-	# Check user defined templates directory
-	if [ ! -e "${LH_TEMPLATES}" ]
+	if [ -d "config/templates/${PACKAGE}" ]
 	then
-		if [ -d config/templates ]
-		then
-			LH_TEMPLATES=config/templates
-		else
-			Echo_error "templates not accessible in %s nor config/templates" "${LH_TEMPLATES}"
-			exit 1
-		fi
-	fi
-
-	if [ -d "${LH_TEMPLATES}/${PACKAGE}" ]
+		TEMPLATES="config/templates/${PACKAGE}"
+	elif [ -d "${LH_TEMPLATES}/${PACKAGE}" ]
 	then
 		TEMPLATES="${LH_TEMPLATES}/${PACKAGE}"
 	else
-		Echo_error "%s templates not accessible in %s" "${PACKAGE}" "${LH_TEMPLATES}"
+		Echo_error "%s templates not accessible in %s nor config/templates" "${PACKAGE}" "${LH_TEMPLATES}"
 		exit 1
 	fi
 }

-- 
Debian Live build scripts