[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Fix a bug in version-substvar-for-external-package parsing to prevent false-positives when the LHS of the binary relation contains a substvar. Thanks to Andreas Beckmann. (Closes: #726589)



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 55437163f287f366cffea440871014974e49ed24
Author: Chris Lamb <lamby@debian.org>
Date:   Thu Feb 22 17:51:46 2018 +0000

    Fix a bug in version-substvar-for-external-package parsing to prevent false-positives when the LHS of the binary relation contains a substvar. Thanks to Andreas Beckmann. (Closes: #726589)
---
 checks/version-substvars.pm                                | 2 +-
 debian/changelog                                           | 4 ++++
 t/tests/version-substvars-general/debian/debian/control.in | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/checks/version-substvars.pm b/checks/version-substvars.pm
index fc45124..dff8365 100644
--- a/checks/version-substvars.pm
+++ b/checks/version-substvars.pm
@@ -66,7 +66,7 @@ sub run {
                     tag 'substvar-source-version-is-deprecated', $pkg1;
                 }
                 if (
-                    m/ ($PKGNAME_REGEX)(?: :[-a-z0-9]+)? \s*    # pkg-name $1
+                    m/^($PKGNAME_REGEX)(?: :[-a-z0-9]+)? \s*   # pkg-name $1
                        \(\s*[\>\<]?[=\>\<]\s*                  # REL 
                         \$[{](?:Source-|source:|binary:)Version[}] # {subvar}
                      /x
diff --git a/debian/changelog b/debian/changelog
index 0a585d4..bd0631c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ lintian (2.5.77) UNRELEASED; urgency=medium
   * checks/control-file.{desc,pm}:
     + [CL] Apply a patch from Michael Stapelberg to detect Golang packages
       with invalid or missing Built-Using headers.  (Closes: #891072)
+  * checks/version-substvars.pm:
+    + [CL] Fix a bug in version-substvar-for-external-package parsing to
+      prevent false-positives when the LHS of the binary relation contains
+      a substvar.  Thanks to Andreas Beckmann.  (Closes: #726589)
 
  -- Chris Lamb <lamby@debian.org>  Wed, 21 Feb 2018 19:26:55 +0000
 
diff --git a/t/tests/version-substvars-general/debian/debian/control.in b/t/tests/version-substvars-general/debian/debian/control.in
index 9c57ae1..41c6f8d 100644
--- a/t/tests/version-substvars-general/debian/debian/control.in
+++ b/t/tests/version-substvars-general/debian/debian/control.in
@@ -23,6 +23,7 @@ Architecture: all
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
          foreign-pkg:any (= $\{source:Version\})
 Replaces: other-foreign-pkg:any (<< $\{binary:Version\})
+Recommends: another-foreign-pkg-$\{suffix\}:any (= $\{source:Version\})
 Description: {$description} - data
  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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: