[SCM] Debian package checker branch, master, updated. 2.4.2-47-g7cf10de
The following commit has been merged in the master branch:
commit 825f33361631b475f34bb6c9490c1998d3cf0a9e
Author: Russ Allbery <rra@debian.org>
Date: Sun Jul 25 19:13:41 2010 -0700
Fix Lintian::Relation parsing of only substvars
The previous change accidentally broke handling of package names
that are only substvars. Fix that.
diff --git a/lib/Lintian/Relation.pm b/lib/Lintian/Relation.pm
index a96b959..81dd40f 100644
--- a/lib/Lintian/Relation.pm
+++ b/lib/Lintian/Relation.pm
@@ -76,7 +76,7 @@ sub parse_element {
^\s* # skip leading whitespace
( # package name or substvar (1)
(?: # start of the name
- [a-zA-Z0-9] # start of a package name
+ [a-zA-Z0-9][a-zA-Z0-9+.-]+ # start of a package name
| # or
\$\{[a-zA-Z0-9:-]+\} # substvar
) # end of start of the name
@@ -84,7 +84,7 @@ sub parse_element {
[a-zA-Z0-9+.-]+ # package name portion
| # or
\$\{[a-zA-Z0-9:-]+\} # substvar
- )+ # one or more portion or substvar
+ )* # zero or more portions or substvars
) # end of package name or substvar
(?: # start of optional version
\s* \( # open parenthesis for version part
--
Debian package checker
Reply to: