[SCM] live-build branch, debian-next, updated. debian/3.0_a57-1-23-g52def8e

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 52def8e59acf967923643f68ee1b96e3e0e33e34
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 27 15:38:27 2012 +0200

    Moving aborting when no bootstrap tool is installed from defaults to the respective bootstrap script.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index b18d465..4b9efb2 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -165,9 +165,6 @@ Set_defaults ()
 		elif [ -x "/usr/bin/cdebootstrap" ]
 		then
 			LB_BOOTSTRAP="cdebootstrap"
-		else
-			Echo_error "Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
-			exit 1
 		fi
 	fi
 
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index e8fabe3..1ea0505 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -29,6 +29,14 @@ then
 	exit 0
 fi
 
+if [ -x "$(which cdebootstrap 2>/dev/null)" ]
+then
+	echo "E: cdebootstrap - command not found"; \
+	echo "I: cdebootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/cdebootstrap/"; \
+	echo "I: On Debian based systems, cdebootstrap can be installed with 'apt-get install debootstrap'."; \
+	exit 1
+fi
+
 # Check architecture
 Check_crossarchitectures
 
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 901b907..9312f10 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -29,6 +29,14 @@ then
 	exit 0
 fi
 
+if [ -x "$(which debootstrap 2>/dev/null)" ]
+then
+	echo "E: debootstrap - command not found"; \
+	echo "I: debootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/debootstrap/"; \
+	echo "I: On Debian based systems, debootstrap can be installed with 'apt-get install debootstrap'."; \
+	exit 1
+fi
+
 # Check architecture
 Check_crossarchitectures
 

-- 
live-build