[debhelper-devel] [debhelper] 07/15: dh_installdocs: Use new glob_expand-enabled filearray

[Niels Thykier]

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

nthykier pushed a commit to branch glob-refactor
in repository debhelper.

commit 4cb622b2a52e460b5df27dccb25c5e4a713b5ae7
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jun 27 16:38:02 2017 +0000

    dh_installdocs: Use new glob_expand-enabled filearray
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_installdocs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dh_installdocs b/dh_installdocs
index 840fa1f..4823b0a 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -181,8 +181,9 @@ init(options => {
 });
 
 my $called_getpackages = 0;
-my $nodocs = 0;
-$nodocs = 1 if is_build_profile_active('nodoc');
+my @search_dirs = ('.');
+my $error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
+my $nodocs = is_build_profile_active('nodoc') ? 1 : 0;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
@@ -224,7 +225,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if (not $nodocs) {
 		if ($file) {
-			@docs = filearray($file, ".");
+			@docs=filearray($file, \@search_dirs, $error_handler);
 		}
 
 		if (($package eq $dh{FIRSTPACKAGE} || ($dh{PARAMS_ALL} && !$link_doc)) && @ARGV) {

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