diff options
author | Ansgar Burchardt <ansgar@debian.org> | 2016-09-08 15:28:19 (GMT) |
---|---|---|
committer | Ansgar Burchardt <ansgar@debian.org> | 2016-09-08 15:28:19 (GMT) |
commit | 81ebc7df61e8a80915126351e01e016f6a57a52a (patch) | |
tree | f4d89091242c4536989c503fe55455bfcad8436b | |
parent | 71f8a7626cc5c10da0c307fa3f70cb0e0d44a013 (diff) | |
download | debootstrap-81ebc7df61e8a80915126351e01e016f6a57a52a.zip debootstrap-81ebc7df61e8a80915126351e01e016f6a57a52a.tar.gz debootstrap-81ebc7df61e8a80915126351e01e016f6a57a52a.tar.bz2 |
Validate SUITE against Release's Suite or Codename
Bug: https://bugs.debian.org/837075
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | functions | 14 |
2 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 9a6412b..96a1dc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debootstrap (1.0.83) UNRELEASED; urgency=medium + + * functions: Validate that the requested suite is listed in the + Release file's Suite or Codename field. (Closes: #837075) + + -- Ansgar Burchardt <ansgar@debian.org> Thu, 08 Sep 2016 17:26:53 +0200 + debootstrap (1.0.82) unstable; urgency=medium [ Alex Bennée ] @@ -512,6 +512,18 @@ extract_release_components () { fi } +CODENAME="" +validate_suite () { + local reldest="$1" + + CODENAME=$(sed -n "s/^Codename: *//p" "$reldest") + local suite=$(sed -n "s/^Suite: *//p" "$reldest") + + if [ "$SUITE" != "$suite" ] && [ "$SUITE" != "$CODENAME" ]; then + error 1 WRONGSUITE "Asked to install suite %s, but got %s (codename: %s) from mirror" "$SUITE" "$suite" "$CODENAME" + fi +} + download_release_sig () { local m1="$1" local reldest="$2" @@ -547,6 +559,8 @@ download_release_indices () { download_release_sig "$m1" "$reldest" "$relsigdest" + validate_suite "$reldest" + extract_release_components $reldest local totalpkgs=0 |