[debhelper-devel] [debhelper] 15/15: dh_installwm: 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 glob-refactor
in repository debhelper.

commit a3d9fd033c2705ed9ab91478afcefd5d26d18517
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jun 28 13:14:52 2017 +0000

    dh_installwm: Permit missing manpage under nodoc profile
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_installwm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dh_installwm b/dh_installwm
index 7c215cd..4109059 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -76,6 +76,9 @@ if (@ARGV) {
 }
 
 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
+$error_handler = \&glob_expand_error_handler_silently_ignore if $nodocs;
 
 # PROMISE: DH NOOP WITHOUT wm
 
@@ -106,8 +109,10 @@ WM:		foreach my $wm (@wm) {
 					}
 				}
 			}
-			if (! compat(9)) {
+			if (not compat(9) and not $nodocs) {
 				error("no manpage found (creating an x-window-manager alternative requires a slave symlink for the manpage)");
+			} else {
+				warning("no manpage found (creating an x-window-manager alternative requires a slave symlink for the manpage)");
 			}
 			# Reaching this code means a broken package will be produced.
 			autoscript($package,"postinst","postinst-wm-noman","s:#WM#:$wm:g;s/#PRIORITY#/$dh{PRIORITY}/g",);

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