[debhelper-devel] [debhelper] 09/15: dh_installwm: Use new glob_expand-enabled filearray

Niels Thykier nthykier at moszumanska.debian.org
Wed Jun 28 13:47:48 UTC 2017


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

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

commit 82d963bcc6dd5a8d163bfa04fa6914792abfdf5e
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jun 27 16:51:41 2017 +0000

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

diff --git a/dh_installwm b/dh_installwm
index 88800ff..7c215cd 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -75,6 +75,8 @@ if (@ARGV) {
 	}
 }
 
+my $error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
+
 # PROMISE: DH NOOP WITHOUT wm
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -83,7 +85,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	my @wm;
 	if ($file) {
-		@wm=filearray($file, '.');
+		@wm=filearray($file, ['.'], $error_handler);
 	}
 
 	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




More information about the debhelper-devel mailing list