The following commit has been merged in the master branch:
commit 3d7428734f86a014e52deb930cfe78d3a87ef04b
Author: James McCoy <[email protected]>
Date: Sun May 12 22:38:35 2013 -0400
dch: Recognize oldstable backports while oldstable is supported.
Closes: #707616
Signed-off-by: James McCoy <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index eeda1e0..818051b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,10 @@ devscripts (2.13.2) UNRELEASED; urgency=low
$SIG{__DIE__}/$SIG{__WARN__} to prevent breaking die/warn in other
modules. (Closes: #669942)
* licensecheck: Fix invalid regular expression syntax. (Closes: #706232)
- * debchange: Set Wheezy as the default --bpo target. (Closes: #703633)
+ * debchange:
+ + Set Wheezy as the default --bpo target. (Closes: #703633)
+ + Recognize oldstable backports while oldstable is supported. (Closes:
+ #707616)
* rc-alert: Change description of I flag to reference wheezy instead of
lenny. (Closes: #683491)
* who-permits-upload:
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 1500301..98acd63 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -486,17 +486,22 @@ if (defined $opt_D) {
if ($vendor eq 'Debian') {
unless ($opt_D =~
/^(experimental|unstable|UNRELEASED|((old)?stable|testing)(-proposed-updates|-security)?|proposed-updates)$/)
{
my $deb_info = get_debian_distro_info();
- my $stable_backports = "";
+ my ($oldstable_backports, $stable_backports) = ("", "");
if ($deb_info == 0) {
warn "$progname warning: Unable to determine Debian's backport
distributions.\n";
} else {
$stable_backports = $deb_info->stable() . "-backports";
+ # Silence any potential warnings $deb_info emits when oldstable
is no longer supported
+ local $SIG{__WARN__} = sub {};
+ my $oldstable = $deb_info->old();
+ $oldstable_backports = "$oldstable-backports" if $oldstable;
}
- if ($deb_info == 0 || not $opt_D eq $stable_backports) {
- $stable_backports = ", " . $stable_backports if not
$stable_backports eq "";
+ 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$stable_backports
and UNRELEASED.\n"
+ .
"{testing,stable,oldstable}-security$oldstable_backports$stable_backports and
UNRELEASED.\n"
. "Using your request anyway.\n";
$warnings++ if not $opt_force_dist;
}
--
Git repository for devscripts
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
