[SCM] Debian package checker branch, master, updated. 2.2.5-20-g3b3fcab
The following commit has been merged in the master branch:
commit 3b3fcab5b4ea1cf95c8d520fc48ccb8bd8c9770b
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Sat Feb 14 22:23:17 2009 +0000
Anchor distribution regexes so that we don't accept foo-backportss as valid
Anchor the regular expressions for the backports, security and
proposed-updates distribution checks, so that etch-backports is
accepted as a valid distribution but etch-backportss is not.
diff --git a/debian/changelog b/debian/changelog
index 4320d7f..d1141eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,9 @@ lintian (2.2.6) UNRELEASED; urgency=low
+ [ADB] Split the Distribution field of a .changes file into individual
distributions and then check each of them against the list of known
distributions. (Closes: #514853)
+ + [ADB] Anchor the regular expressions for the backports, security and
+ proposed-updates distribution checks, so that etch-backports is
+ accepted as a valid distribution but etch-backportss is not.
* private/refresh-virtual-packages-data:
+ [RA] New script to generate the list of virtual packages. Based on
diff --git a/frontend/lintian b/frontend/lintian
index 9718b7f..c0830a0 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -822,9 +822,9 @@ while (my $arg = shift) {
or ($distribution eq 'testing')
or ($distribution eq 'unstable')
or ($distribution eq 'experimental')
- or ($distribution =~ /\w+-backports/)
- or ($distribution =~ /\w+-proposed-updates/)
- or ($distribution =~ /\w+-security/))
+ or ($distribution =~ /^\w+-backports$/)
+ or ($distribution =~ /^\w+-proposed-updates$/)
+ or ($distribution =~ /^\w+-security$/))
) {
# bad distribution entry
tag("bad-distribution-in-changes-file",
diff --git a/t/tests/distribution-multiple-bad-distributions/debian/debian/changelog.in b/t/tests/distribution-multiple-bad-distributions/debian/debian/changelog.in
index 626f331..5bf3a03 100644
--- a/t/tests/distribution-multiple-bad-distributions/debian/debian/changelog.in
+++ b/t/tests/distribution-multiple-bad-distributions/debian/debian/changelog.in
@@ -1,4 +1,4 @@
-{$srcpkg} ({$version}) stable foo bar unstable; urgency=low
+{$srcpkg} ({$version}) stable foo-backportss bar foo; urgency=low
* Lintian Test Suite.
* Test: {$testname}
diff --git a/t/tests/distribution-multiple-bad-distributions/tags b/t/tests/distribution-multiple-bad-distributions/tags
index 1eca685..0f7b460 100644
--- a/t/tests/distribution-multiple-bad-distributions/tags
+++ b/t/tests/distribution-multiple-bad-distributions/tags
@@ -1,2 +1,3 @@
E: distribution-multiple-bad-distributions_1.0_amd64.changes: bad-distribution-in-changes-file bar
E: distribution-multiple-bad-distributions_1.0_amd64.changes: bad-distribution-in-changes-file foo
+E: distribution-multiple-bad-distributions_1.0_amd64.changes: bad-distribution-in-changes-file foo-backportss
--
Debian package checker
Reply to: