[kernel-team] 03/03: d-k-prerelease, d-k-tag: Handle *-updates branch names

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository kernel-team.

commit 710ef04f713e0c2a608a78674f23e463826b0dc0
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Apr 8 12:02:36 2016 +0100

    d-k-prerelease, d-k-tag: Handle *-updates branch names
    
    These will be used for urgent non-security fixes that should go into
    the stable-updates/oldstable-updates suite rather than waiting for the
    next point release.
---
 scripts/d-k-prerelease | 3 +++
 scripts/d-k-tag        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/d-k-prerelease b/scripts/d-k-prerelease
index c5c1178..b76ec43 100755
--- a/scripts/d-k-prerelease
+++ b/scripts/d-k-prerelease
@@ -44,6 +44,9 @@ sid)
     # https://www.debian.org/doc/manuals/developers-reference/ch05.en.html#bug-security-building
     urgency='high'
     ;;
+*-updates)
+    dist=${branch%-updates}
+    ;;
 */*)
     echo >&2 "E: Can't release from private branch $branch"
     exit 1
diff --git a/scripts/d-k-tag b/scripts/d-k-tag
index f29af16..152a031 100755
--- a/scripts/d-k-tag
+++ b/scripts/d-k-tag
@@ -20,7 +20,7 @@ master,unstable | master,experimental | sid,unstable)
     # OK
     ;;
 *)
-    if [ "$branch" != "$dist" ]; then
+    if [ "$branch" != "$dist" ] && [ "$branch" != "$dist-updates"; then
 	echo >&2 "E: Uploads to $dist do not belong on branch $branch"
 	exit 1
     fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git