[debhelper-devel] [debhelper] 04/15: dh_installman: Use new glob_expand-enabled filearray
Niels Thykier
nthykier at moszumanska.debian.org
Wed Jun 28 13:47:47 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 9b86d17708f7714188a70c35ba04ea9969814a9b
Author: Niels Thykier <niels at thykier.net>
Date: Tue Jun 27 15:53:22 2017 +0000
dh_installman: Use new glob_expand-enabled filearray
Signed-off-by: Niels Thykier <niels at thykier.net>
---
dh_installman | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dh_installman b/dh_installman
index f1ad517..dbde451 100755
--- a/dh_installman
+++ b/dh_installman
@@ -123,6 +123,9 @@ init(options => {
my (@sofiles, @sodests);
my @all_packages = getpackages();
+my @search_dirs = ('.');
+my $error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
+
on_items_in_parallel(\@all_packages, sub {
foreach my $package (@_) {
@@ -132,7 +135,7 @@ on_items_in_parallel(\@all_packages, sub {
my $file = pkgfile($package, "manpages");
my @manpages;
- @manpages = filearray($file, ".") if $file;
+ @manpages = filearray($file, \@search_dirs, $error_handler) if $file;
if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
push @manpages, @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