[SCM] Debian package checker branch, master, updated. 2.2.12-22-g0eb57be
The following commit has been merged in the master branch:
commit 41307725a23e14919849f7c4aef913c71650d7fe
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Mon Jun 29 21:48:09 2009 +0100
Fix missing-separator-between-items' handling of "foo(>= 3)"
If there was no space between the package name and the version relation,
missing-separator-between-items was being incorrectly raised for
"foo(>=" and "3)". dpkg normalizes the relation to include a space so
Lintian should handle such cases.
Also simplify the regex a little now that it no longer needs to handle
architecture lists.
diff --git a/checks/control-file b/checks/control-file
index c5b40fd..e04a086 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -116,13 +116,13 @@ for my $control ($header, @binary_controls) {
$value =~ s/\[[^\]]*\]//g;
if ($value =~ /(?:^|\s)
(
- (?:\w[^\s,|]+|\$\{\S+\})\s*
- (?:\([^\)]*\)\s*|\[[^\]]+\]\s*)*
+ (?:\w[^\s,|\(]+|\$\{\S+\})\s*
+ (?:\([^\)]*\)\s*)?
)
\s+
(
- (?:\w[^\s,|]+|\$\{\S+\})\s*
- (?:\([^\)]*\)\s*|\[[^\]]+\]\s*)*
+ (?:\w[^\s,|\(]+|\$\{\S+\})\s*
+ (?:\([^\)]*\)\s*)?
)/x) {
my ($prev, $next) = ($1, $2);
for ($prev, $next) {
--
Debian package checker
Reply to: