[SCM] Debian package checker branch, master, updated. 2.2.11-1-g8a5e8b1
The following commit has been merged in the master branch:
commit 8a5e8b14b8aefb122b8cbde7c974db175ac1ae09
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Mon Jun 15 19:28:40 2009 +0100
Allow | as well as , when checking for missing control file separators
* checks/control-file{,.desc}:
+ [ADB] Allow both comma and pipe as valid separators between items when
detecting whether a separator has been omitted. As a consequence,
rename the missing-comma-between-items tag to the more descriptive
missing-separator-between-items. Based on a patch by Rafael
Laboissiere. (Closes: #533202)
diff --git a/checks/control-file b/checks/control-file
index 77a6ba5..7286f02 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -116,16 +116,16 @@ for my $control ($header, @binary_controls) {
build-conflics build-conflicts-indep)) {
next unless $control->{$field};
if ($control->{$field} =~ /
- ([^,]+) # previous entry
+ ([^,|]+) # previous entry
\s*\n\s+ # new line + space
- ([a-z][^,]+) # next entry, must start with a letter
+ ([a-z][^,|]+) # next entry, must start with a letter
/x) {
my ($prev, $next) = ($1, $2);
for ($prev, $next) {
s/^\s+//; s/\s+$//;
}
- tag "missing-comma-between-items",
+ tag "missing-separator-between-items",
"in $field field between '$prev' and '$next', " .
($control->{source} ? 'source' : $control->{package});
}
diff --git a/checks/control-file.desc b/checks/control-file.desc
index 3f75157..91c675c 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -142,13 +142,13 @@ Info: The given field in the <tt>debian/control</tt> file has a substvar
the control file will have a syntax error. You probably meant to put a
comma after the substvar expansion.
-Tag: missing-comma-between-items
+Tag: missing-separator-between-items
Severity: important
Certainty: certain
Info: The given field in the <tt>debian/control</tt> file contains a list
- of items separated by commas. It appears that when wrapping the list on
- multiple lines, a comma was missed at the end of a line. This can lead
- to bogus or incomplete dependencies, conflicts etc.
+ of items separated by commas and pipes. It appears that when wrapping
+ the list on multiple lines, a separator was missed at the end of a line.
+ This can lead to bogus or incomplete dependencies, conflicts etc.
Tag: package-depends-on-hardcoded-libc
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index 4e9df58..6c474f0 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+lintian (2.2.12) UNRELEASED; urgency=low
+
+ * Summary of tag changes:
+ + Added:
+ - missing-separator-between-items
+ + Removed:
+ - missing-comma-between-items
+
+ * checks/control-file{,.desc}:
+ + [ADB] Allow both comma and pipe as valid separators between items when
+ detecting whether a separator has been omitted. As a consequence,
+ rename the missing-comma-between-items tag to the more descriptive
+ missing-separator-between-items. Based on a patch by Rafael
+ Laboissiere. (Closes: #533202)
+
+ -- Adam D. Barratt <adam@adam-barratt.org.uk> Mon, 15 Jun 2009 19:21:07 +0100
+
lintian (2.2.11) unstable; urgency=low
* Summary of tag changes:
diff --git a/t/tests/control-file-general/debian/debian/control.in b/t/tests/control-file-general/debian/debian/control.in
index 5b48612..796eaac 100644
--- a/t/tests/control-file-general/debian/debian/control.in
+++ b/t/tests/control-file-general/debian/debian/control.in
@@ -47,3 +47,13 @@ Description: {$description} (three)
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
things. It should not be installed like a regular package.
+
+Package: {$srcpkg}-4
+Section: {$section}
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foo |
+ bar (>= 1), baz
+Description: {$description} (four)
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package.
diff --git a/t/tests/control-file-general/desc b/t/tests/control-file-general/desc
index 230cdb2..15f3c72 100644
--- a/t/tests/control-file-general/desc
+++ b/t/tests/control-file-general/desc
@@ -8,8 +8,9 @@ Test-For:
duplicate-long-description
duplicate-short-description
missing-comma-after-substvar
- missing-comma-between-items
+ missing-separator-between-items
no-section-field-for-source
package-depends-on-itself
stronger-dependency-implies-weaker
-References: Debian Bug#30020, Debian Bug#409099, Debian Bug#516706
+References: Debian Bug#30020, Debian Bug#409099, Debian Bug#516706,
+ Debian Bug#533202
diff --git a/t/tests/control-file-general/tags b/t/tests/control-file-general/tags
index 179ce32..76cea17 100644
--- a/t/tests/control-file-general/tags
+++ b/t/tests/control-file-general/tags
@@ -1,7 +1,7 @@
E: control-file-general source: build-info-in-binary-control-file-section Package control-file-general
-E: control-file-general source: missing-comma-between-items in depends field between 'foo' and 'bar (>= 1)', control-file-general-3
+E: control-file-general source: missing-separator-between-items in depends field between 'foo' and 'bar (>= 1)', control-file-general-3
I: control-file-general source: binary-control-field-duplicates-source field "maintainer" in package control-file-general
-I: control-file-general source: duplicate-long-description control-file-general control-file-general-1 control-file-general-2 control-file-general-3
+I: control-file-general source: duplicate-long-description control-file-general control-file-general-1 control-file-general-2 control-file-general-3 control-file-general-4
I: control-file-general source: duplicate-short-description control-file-general control-file-general-1
W: control-file-general source: missing-comma-after-substvar in depends field near ${shlibs:Depends}
W: control-file-general source: no-section-field-for-source
--
Debian package checker
Reply to: