[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. e39df79545bc55e2b525785e2043b8e1576cf284

[Steffen Moeller]

The following commit has been merged in the master branch:
commit d09bb5e8515f19d1edc710b55984561ac2e2d93b
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Oct 22 21:38:50 2010 +0200

    Updated version of cdebootstrap

diff --git a/install.sh b/install.sh
index 5daf32e..71de949 100755
--- a/install.sh
+++ b/install.sh
@@ -98,7 +98,7 @@ intern_no_partitioning=""
 # with packages for a basic debian with network connectivity
 CDEBOOTSTRAP_FLAVOUR=minimal
 DEBOOTSTRAP_VARIANT=minbase
-CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.6_armel.deb
+CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.7_armel.deb
 DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.23_all.deb
 CDEBOOTSTRAP_EXTRA_PACKAGES=
 DEBOOTSTRAP_EXTRA_PACKAGES=install-info
@@ -936,7 +936,15 @@ action_debian () {
 	echo " * Downloading bootstrapper package '`basename $intern_bootstrapper_package`'"
         if [ -n "$VERBOSE" ]; then echo "   from $intern_bootstrapper_package"; fi
 	internal_localpackagename=/tmp/debootstrapOrCdebootstrap.deb
-	wget $intern_bootstrapper_package -O "$internal_localpackagename"
+	if ! wget $intern_bootstrapper_package -O "$internal_localpackagename"; then
+		echo <<EOWGETFAILURE
+E: Could not download debian bootstrap tool '$BOOTSTRAPPER'. Check
+   with page http://packages.debian.org/sid/$BOOTSTRAPPER if the
+   version shown is the same as in
+   $intern_bootstrapper_package .
+EOWGETFAILURE
+		exit -1
+	fi
 	rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
 	(
 		cd /tmp

-- 
Various non-packaged files