summaryrefslogtreecommitdiffstats
path: root/auto/scripts
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-11-15 11:23:14 +0100
committerTails developers <amnesia@boum.org>2012-11-15 11:28:19 +0100
commitbd32d8f2d0306ce7abf665f3bbaa572efd22e02a (patch)
tree78099c1ebea6ff8cef61f59a7c1b00b048774cf3 /auto/scripts
parent0eb38d9e3bc3cb9acaa89032f2ac295f11cf4c65 (diff)
Handle release candidates when generating custom APT sources
Release candidates version numbers (in debian/changelog) do not match the Git tag name: 0.12~rc1 vs. 0.12-rc1. So we need to convert `~` in version_was_released(). We also need to convert the version to the corresponding suite name, using the same rules as branch names.
Diffstat (limited to 'auto/scripts')
-rwxr-xr-xauto/scripts/tails-custom-apt-sources3
1 files changed, 2 insertions, 1 deletions
diff --git a/auto/scripts/tails-custom-apt-sources b/auto/scripts/tails-custom-apt-sources
index 5e37c28..e8d0105 100755
--- a/auto/scripts/tails-custom-apt-sources
+++ b/auto/scripts/tails-custom-apt-sources
@@ -14,6 +14,7 @@ git_tag_exists() {
version_was_released() {
local version="$1"
+ version="$(echo "$version" | tr '~' '-')"
git_tag_exists "$version"
}
@@ -44,7 +45,7 @@ branch_name_to_suite() {
if version_was_released "$(version_in_changelog)"; then
- output_apt_binary_source "$(version_in_changelog)"
+ output_apt_binary_source "$(branch_name_to_suite "$(version_in_changelog)")"
elif [ "$(current_branch)" = "testing" ]; then
output_apt_binary_source testing
elif [ "$(current_branch)" = "experimental" ]; then