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

Re: [lintian] 02/02: Check all subdirectories under /usr/share/doc/foo to test whether we ship example files, not just /usr/share/doc/foo/examples/.



Chris Lamb:
> This is an automated email from the git hooks/post-receive script.
> 
> lamby pushed a commit to branch master
> in repository lintian.
> 
> commit 9027b8319fb4635355abda605eb1fe929e982f2a
> Author: Chris Lamb <lamby@debian.org>
> Date:   Tue Mar 6 22:15:26 2018 -0800
> 
>     Check all subdirectories under /usr/share/doc/foo to test whether we ship example files, not just /usr/share/doc/foo/examples/.
> ---
>  checks/cruft.pm  | 2 +-
>  debian/changelog | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/checks/cruft.pm b/checks/cruft.pm
> index db21095..5a7ef79 100644
> --- a/checks/cruft.pm
> +++ b/checks/cruft.pm
> @@ -1575,7 +1575,7 @@ sub _ships_examples {
>          # If we have an -examples package, assume we ship examples.
>          return 1 if $name =~ m{-examples$};
>          my @files = $binpkg->info->sorted_index;
> -        return 1 if any { m{^usr/share/doc/$name/examples/$} } @files;
> +        return 1 if any { m{^usr/share/doc/$name/(.+/)?examples/$} } @files;
                                              ^^^^^

While you are updating that code path, could you add the missing the \Q
\E around that $name (or quotemeta)?  Otherwise we get incorrect results
for packages like "g++" (interpreted as "1 or more instances of the
letter g" rather than "literally g++").

I believe this is a reoccurring problem in the code base, so you will
probably notice it elsewhere as well.

Thanks,
~Niels


Reply to: