[SCM] Debian package checker branch, master, updated. 2.2.6-39-g7d83627
The following commit has been merged in the master branch:
commit 7d83627c298e567882711e4cfa99bdf7e7e253bb
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Wed Mar 4 18:41:12 2009 +0000
Avoid capturing parentheses in regexes due to their minor performance penalty.
diff --git a/checks/shared-libs b/checks/shared-libs
index 32181e8..e999826 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -368,7 +368,7 @@ if ($#shlibs == -1 and not %unversioned_shlibs) {
chomp;
next if m/^\s*$/ or /^#/;
- if (m/^([^\s|*]\S+)\s\S+\s*(\(\S+\s+\S+\)|#MINVER#)?/) {
+ if (m/^([^\s|*]\S+)\s\S+\s*(?:\(\S+\s+\S+\)|#MINVER#)?/) {
# soname, main dependency template
$soname = $1;
@@ -399,7 +399,7 @@ if ($#shlibs == -1 and not %unversioned_shlibs) {
$dep_templates = 0;
$meta_info_seen = 0;
$symbol_count = 0;
- } elsif (m/^\|\s+\S+\s*(\(\S+\s+\S+\)|#MINVER#)?/) {
+ } elsif (m/^\|\s+\S+\s*(?:\(\S+\s+\S+\)|#MINVER#)?/) {
# alternative dependency template
$warned = 0;
@@ -425,7 +425,7 @@ if ($#shlibs == -1 and not %unversioned_shlibs) {
}
$dep_templates++ unless $warned;
- } elsif (m/^\*\s(\S+):\s(\S+)/) {
+ } elsif (m/^\*\s(\S+):\s\S+/) {
# meta-information
# This should probably be in a hash, but there's
@@ -436,7 +436,7 @@ if ($#shlibs == -1 and not %unversioned_shlibs) {
unless defined $soname and $symbol_count == 0;
$meta_info_seen = 1;
- } elsif (m/^\s+(\S+)\s(\S+)(?:\s(\S+(\s\S+)?))?$/) {
+ } elsif (m/^\s+(\S+)\s(\S+)(?:\s(\S+(?:\s\S+)?))?$/) {
# Symbol definition
tag "syntax-error-in-symbols-file", $.
diff --git a/debian/changelog b/debian/changelog
index b3d9ee3..8e4761a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,8 @@ lintian (2.2.7) UNRELEASED; urgency=low
handle ORed dependencies.
+ [RA] Be robust against whitespace in the Architecture field.
+ [ADB] Use Lintian::Relation rather than Dep.
+ + [ADB] Avoid capturing parentheses in regexes due to their minor
+ performance penalty.
* checks/version-substvars:
+ [RA] Be robust against whitespace in the Architecture field.
Thanks, Gonéri Le Bouder. (Closes: #517555)
--
Debian package checker
Reply to: