[debhelper-devel] [debhelper] 04/17: dh_installexamples: Permit missing manpage under nodoc profile

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 1388c2ac52deee1f27422b2bcb1965d70b9e5ae1
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jun 29 07:37:04 2017 +0000

    dh_installexamples: Permit missing manpage under nodoc profile
---
 dh_installexamples | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dh_installexamples b/dh_installexamples
index 53ddc74..56d4e44 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -66,6 +66,10 @@ init();
 my $pwd;
 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;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
@@ -82,7 +86,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
 		push @examples, @ARGV;
 	}
-	
+
+	next if $nodocs;
+
 	if (@examples) {
 		install_dir("$tmp/usr/share/doc/$package/examples");
 

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