[debhelper-devel] [debhelper] 12/15: dh_installinfo: Ignore missing info-files 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 e781a740c63f72af4a276de6b2a7ba85212915aa
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jun 28 12:46:50 2017 +0000

    dh_installinfo: Ignore missing info-files under nodoc profile
    
    We could just exit out early, but we want to log the installed info
    files so dh_missing can see them.  This will happen in a seperate
    commit.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_installinfo | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dh_installinfo b/dh_installinfo
index d805e80..08a68f6 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -52,6 +52,10 @@ init();
 # PROMISE: DH NOOP WITHOUT info
 
 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}}) {
 	my $tmp=tmpdir($package);
@@ -67,6 +71,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		push @info, @ARGV;
 	}
 
+	next if $nodocs;
+
 	if (@info) {
 		install_dir("$tmp/usr/share/info");
 		xargs(\@info, "cp", '--reflink=auto', XARGS_INSERT_PARAMS_HERE, "$tmp/usr/share/info");

-- 
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