[debhelper-devel] [debhelper] 11/15: dh_installman: Ignore missing manpages under nodoc profile
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 397b4c9a9b3998c42d5ae34841af633a1bee272c
Author: Niels Thykier <niels at thykier.net>
Date: Wed Jun 28 12:45:04 2017 +0000
dh_installman: Ignore missing manpages under nodoc profile
Signed-off-by: Niels Thykier <niels at thykier.net>
---
dh_installman | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dh_installman b/dh_installman
index dbde451..4bbbea3 100755
--- a/dh_installman
+++ b/dh_installman
@@ -125,6 +125,10 @@ 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;
+my $nodocs = is_build_profile_active('nodoc') ? 1 : 0;
+# We cannot assume documentation is built under nodoc, but if it is we must flag it as handled
+# or dh_missing might make noise.
+$error_handler = \&glob_expand_error_handler_silently_ignore if $nodocs;
on_items_in_parallel(\@all_packages, sub {
@@ -143,7 +147,7 @@ on_items_in_parallel(\@all_packages, sub {
log_installed_files($package, @manpages);
- next if not process_pkg($package);
+ next if not process_pkg($package) or $nodocs;
foreach my $page (@manpages) {
my $basename = basename($page);
--
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