[SCM] live-build branch, debian-next, updated. debian/3.0_a13-1-8-gf261b47

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit f261b470f85d093ac9a9a16741901c4a47b9b87f
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Mar 21 20:36:50 2011 +0100

    Disabling security and volatile repositories for unreleased distributions.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 9c8955e..0f17e05 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -773,10 +773,26 @@ Set_defaults ()
 	LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|  ||g')"
 
 	# Setting security updates option
-	LB_SECURITY="${LB_SECURITY:-true}"
+	case "${LB_DISTRIBUTION}" in
+		wheezy|sid|baureo)
+			LB_SECURITY="${LB_SECURITY:-false}"
+			;;
+
+		*)
+			LB_SECURITY="${LB_SECURITY:-true}"
+			;;
+	esac
 
 	# Setting volatile updates option
-	LB_VOLATILE="${LB_VOLATILE:-true}"
+	case "${LB_DISTRIBUTION}" in
+		wheezy|sid|baureo)
+			LB_VOLATILE="${LB_VOLATILE:-false}"
+			;;
+
+		*)
+			LB_VOLATILE="${LB_VOLATILE:-true}"
+			;;
+	esac
 
 	## config/binary
 

-- 
live-build