The following commit has been merged in the master branch:
commit 6c27e7c9ea1e9d1fc91abf470bd679622ebe1275
Author: Modestas Vainius <[email protected]>
Date: Sat Mar 20 17:41:08 2010 -0700
Avoid trailing whitespace for symbols dependency on other package
If dependency is not versioned,
symbols-declares-dependency-on-other-package tag will have a trailing
space. This makes it tricky to declare overrides.
diff --git a/checks/shared-libs b/checks/shared-libs
index 8c32a4f..1450f4b 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -403,10 +403,10 @@ if ($#shlibs == -1 and not %unversioned_shlibs) {
foreach my $part (split /\s*,\s*/) {
foreach my $subpart (split /\s*\|\s*/, $part) {
- $subpart =~ m,^(\S+)\s*(\(\S+\s+\S+\)|#MINVER#)?$,;
+ $subpart =~ m,^(\S+)(\s*(?:\(\S+\s+\S+\)|#MINVER#))?$,;
($dep_package, $dep) = ($1, $2 || '');
if (defined $dep_package) {
- push @symbols_depends, $dep_package . ' ' . $dep;
+ push @symbols_depends, $dep_package . $dep;
} else {
tag "syntax-error-in-symbols-file", $.
unless $warned;
@@ -433,10 +433,10 @@ if ($#shlibs == -1 and not %unversioned_shlibs) {
foreach my $part (split /\s*,\s*/) {
foreach my $subpart (split /\s*\|\s*/, $part) {
- $subpart =~ m,^(\S+)\s*(\(\S+\s+\S+\)|#MINVER#)?$,;
+ $subpart =~ m,^(\S+)(\s*(?:\(\S+\s+\S+\)|#MINVER#))?$,;
($dep_package, $dep) = ($1, $2 || '');
if (defined $dep_package) {
- push @symbols_depends, $dep_package . ' ' . $dep;
+ push @symbols_depends, $dep_package . $dep;
} else {
tag "syntax-error-in-symbols-file", $. unless $warned;
$warned = 1;
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
