[devscripts] 03/07: debchange: Support $codename{, -{proposed-updates, security}} as well as (old)stable-foo, etc

[James McCoy]

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

jamessan pushed a commit to branch stretch
in repository devscripts.

commit f3bbf048303883fd7638a98e3d7de7d97aca6d77
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Jun 26 12:07:24 2017 +0200

    debchange: Support $codename{,-{proposed-updates,security}} as well as (old)stable-foo, etc
    
    That whole code should probably be changed to use data coming from
    distro-info-data exclusively (and it already does for backports), but
    it's not entirely possible until it supports oldoldstable (#782685)
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog     |  1 +
 scripts/debchange.pl | 11 +++++++----
 test/test_debchange  |  7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 377cae1..13db11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ devscripts (2.17.6+deb9u1) UNRELEASED; urgency=medium
   [ Mattia Rizzolo ]
   * debchange:
     + Target stretch-backports with --bpo.
+    + Support $codename{,-{proposed-updates,security}} as well.
 
  -- James McCoy <jamessan at debian.org>  Tue, 11 Jul 2017 21:28:50 -0400
 
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index c63c742..081fff6 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -472,7 +472,7 @@ if ($vendor eq 'Ubuntu' and ($opt_n or $opt_bn or $opt_qa or $opt_bpo)) {
 # Check the distro name given.
 if (defined $opt_D) {
     if ($vendor eq 'Debian') {
-	unless ($opt_D =~ /^(experimental|unstable|UNRELEASED|((old)?stable|testing)(-proposed-updates)?|proposed-updates|(wheezy|jessie|stretch|buster|bullseye)-security)$/) {
+	unless ($opt_D =~ /^(experimental|unstable|sid|UNRELEASED|((old){0,2}stable|testing|wheezy|jessie|stretch|buster|bullseye)(-proposed-updates|-security)?|proposed-updates)$/) {
 	    my $deb_info = get_debian_distro_info();
 	    my ($oldstable_backports, $stable_backports) = ("", "");
 	    if ($deb_info == 0) {
@@ -487,9 +487,12 @@ if (defined $opt_D) {
 	    if ($deb_info == 0 || $opt_D !~ m/^(\Q$stable_backports\E|\Q$oldstable_backports\E)$/) {
 		$stable_backports = ", " . $stable_backports if $stable_backports;
 		$oldstable_backports = ", " . $oldstable_backports if $oldstable_backports;
-		warn "$progname warning: Recognised distributions are: unstable, testing, stable,\n"
-		     . "oldstable, experimental, {testing-,stable-,oldstable-,}proposed-updates,\n"
-		     . "{testing,stable,oldstable}-security$oldstable_backports$stable_backports and UNRELEASED.\n"
+		warn "$progname warning: Recognised distributions are: \n"
+		     . "experimental, unstable, testing, stable, oldstable, oldoldstable,\n"
+                     . "{bullseye,buster,stretch,jessie,wheezy}-proposed-updates,\n"
+		     . "{testing,stable,oldstable,oldoldstable}-proposed-updates,\n"
+                     . "{bullseye,buster,stretch,jessie,wheezy}-security,\n"
+		     . "{testing,stable,oldstable,oldoldstable}}-security$oldstable_backports$stable_backports and UNRELEASED.\n"
 		     . "Using your request anyway.\n";
 		$warnings++ if not $opt_force_dist;
 	    }
diff --git a/test/test_debchange b/test/test_debchange
index 503764e..04b96a6 100755
--- a/test/test_debchange
+++ b/test/test_debchange
@@ -82,14 +82,21 @@ checkUbuntuVersion() {
 }
 
 testDebianDistributions() {
+    checkDebianDistribution "bullseye"
     checkDebianDistribution "bullseye-security"
+    checkDebianDistribution "buster"
     checkDebianDistribution "buster-security"
+    checkDebianDistribution "stretch"
     checkDebianDistribution "stretch-security"
+    checkDebianDistribution "jessie"
+    checkDebianDistribution "jessie-proposed-updates"
     checkDebianDistribution "jessie-security"
     checkDebianDistribution "wheezy-security"
     checkDebianDistribution "experimental"
     checkDebianDistribution "oldstable"
     checkDebianDistribution "oldstable-proposed-updates"
+    checkDebianDistribution "oldoldstable"
+    checkDebianDistribution "oldoldstable-proposed-updates"
     checkDebianDistribution "proposed-updates"
     checkDebianDistribution "stable"
     checkDebianDistribution "stable-proposed-updates"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git