From 809f127163e9f286315bce704449c96edeab9013 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Tue, 1 Jul 2008 11:06:08 +0000
Subject: * Do not cache Release and Release.gpg files. Closes: #488424. *
 Abort if a Packages file failed to verify. * Update standards version to
 3.8.0; no other changes needed.

r54000
---
 debian/changelog |  7 ++++++-
 debian/control   |  2 +-
 functions        | 29 +++++++++++++++++++++--------
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ce9cca..01e6c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,12 @@ debootstrap (1.0.10) UNRELEASED; urgency=low
     The errors themselves are inherent to how the function is used, so just
     suppress them. Closes: #480560.
 
- -- Frans Pop <fjp@debian.org>  Mon, 19 May 2008 00:35:55 +0200
+  [ Frans Pop ]
+  * Do not cache Release and Release.gpg files. Closes: #488424.
+  * Abort if a Packages file failed to verify.
+  * Update standards versionto 3.8.0; no other changes needed.
+
+ -- Frans Pop <fjp@debian.org>  Tue, 01 Jul 2008 13:02:41 +0200
 
 debootstrap (1.0.9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b663831..a46c6bb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>
 Build-Depends: debhelper (>= 4.2), makedev (>= 2.3.1-69)
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/debootstrap
 
 Package: debootstrap
diff --git a/functions b/functions
index 4c41ce1..b9180ba 100644
--- a/functions
+++ b/functions
@@ -247,6 +247,7 @@ check_md5 () {
 }
 
 get () {
+	# args: from dest 'nocache'
 	# args: from dest [md5sum size] [alt {md5sum size type}]
 	local displayname
 	if [ "${2%.deb}" != "$2" ]; then
@@ -258,14 +259,22 @@ get () {
 	if [ -e "$2" ]; then
 		if [ "$3" = "" ]; then
 			return 0
-		fi
-		info VALIDATING "Validating %s" "$displayname"
-		if check_md5 "$2" "$3" "$4"; then
-			return 0
-		else
+		elif [ "$3" = nocache ]; then
 			rm -f "$2"
+		else
+			info VALIDATING "Validating %s" "$displayname"
+			if check_md5 "$2" "$3" "$4"; then
+				return 0
+			else
+				rm -f "$2"
+			fi
 		fi
 	fi
+	# Drop 'nocache' option
+	if [ "$3" = nocache ]; then
+		set "$1" "$2"
+	fi
+
 	if [ "$#" -gt 5 ]; then
 		local st=3
 		if [ "$5" = "-" ]; then st=6; fi
@@ -441,7 +450,7 @@ download_release_sig () {
 	if [ -n "$KEYRING" ]; then
 		progress 0 100 DOWNRELSIG "Downloading Release file signature"
 		progress_next 50
-		get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" ||
+		get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache ||
 			error 1 NOGETRELSIG "Failed getting release signature file %s" \
 			"$m1/dists/$SUITE/Release.gpg"
 		progress 50 100 DOWNRELSIG "Downloading Release file signature"
@@ -460,7 +469,7 @@ download_release_indices () {
 	local reldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release")"
 	progress 0 100 DOWNREL "Downloading Release file"
 	progress_next 100
-	get "$m1/dists/$SUITE/Release" "$reldest" ||
+	get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
 		error 1 NOGETREL "Failed getting release file %s" "$m1/dists/$SUITE/Release"
 
 	TMPCOMPONENTS="$(sed -n 's/Components: *//p' "$reldest")"
@@ -506,6 +515,7 @@ download_release_indices () {
 	done
 
 	local donepkgs=0
+	local pkgdest
 	progress 0 $totalpkgs DOWNPKGS "Downloading Packages files"
 	for c in $COMPONENTS; do
 		local subpath="$c/binary-$ARCH/Packages"
@@ -529,9 +539,12 @@ download_release_indices () {
 		fi
 		progress_next "$(($donepkgs + ${md#* }))"
 		for m in $MIRRORS; do
-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
+			pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
 			if get "$m/$path" "$pkgdest" $ext; then break; fi
 		done
+		if [ ! -f "$pkgdest" ]; then
+			error 1 COULDNTDL "Couldn't download %s" "$path"
+		fi
 		donepkgs="$(($donepkgs + ${md#* }))"
 		progress $donepkgs $totalpkgs DOWNPKGS "Downloading Packages files"
 	done
-- 
cgit v0.12