summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2013-03-25 15:20:31 +0100
committerJulien Cristau <jcristau@debian.org>2013-03-25 15:20:31 +0100
commit4b40f90ddbe5ce9ee74aec781abb5419e9b43918 (patch)
treed41b5e9d2beed0d2ddc84e031f356661a896099e
parent56cd612223507d9744224ec4d7c0aa9c06cc9985 (diff)
downloaddebootstrap-4b40f90ddbe5ce9ee74aec781abb5419e9b43918.tar.gz
Move extract_release_components to after signature verification.
Suggested by Ansgar Burchardt.
-rw-r--r--debian/changelog2
-rw-r--r--functions3
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8dc903e..1449609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debootstrap (1.0.48) UNRELEASED; urgency=low
* Disable InRelease support. gpgv won't give us back the signed data, and
full gpg is not available inside d-i (closes: #703889).
+ * Move extract_release_components to after signature verification.
+ Suggested by Ansgar Burchardt.
-- Julien Cristau <jcristau@debian.org> Mon, 25 Mar 2013 14:16:19 +0100
diff --git a/functions b/functions
index 068aa06..2dc777d 100644
--- a/functions
+++ b/functions
@@ -532,11 +532,12 @@ download_release_indices () {
get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
error 1 NOGETREL "Failed getting release file %s" "$m1/dists/$SUITE/Release"
relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release.gpg")"
- extract_release_components $reldest
progress 100 100 DOWNREL "Downloading Release file"
download_release_sig "$m1" "$reldest" "$relsigdest"
+ extract_release_components $reldest
+
local totalpkgs=0
for c in $COMPONENTS; do
local subpath="$c/binary-$ARCH/Packages"