[debhelper-devel] [debhelper] 06/15: dh_installinfo: 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 260f0aaa81a82e16f5a8283379dcaec958d7f4ed
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jun 27 16:01:49 2017 +0000

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

diff --git a/dh_installinfo b/dh_installinfo
index 1ad277e..d805e80 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -51,6 +51,8 @@ init();
 
 # PROMISE: DH NOOP WITHOUT info
 
+my $error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $file=pkgfile($package,"info");
@@ -58,7 +60,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my @info;
 	
 	if ($file) {
-		@info=filearray($file, ".");
+		@info = filearray($file, ['.'], $error_handler) if $file;
 	}
 
 	if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {

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