[debhelper-devel] [debhelper] 01/06: dh_installman: always log manpages for all packages

[Niels Thykier]

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

nthykier pushed a commit to branch bug-415396-dh_missing
in repository debhelper.

commit b69c7b9a0271c088657c73d98108d09ce2c76dd7
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Apr 3 10:17:47 2017 +0000

    dh_installman: always log manpages for all packages
    
    Like with dh_install, we have to log installed files for all packages
    (even those not acted on).  Otherwise, dh_missing will get the wrong
    results for "dpkg-buildpackage -B/-A" builds where only a subset of
    the packages are installed.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_installman | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dh_installman b/dh_installman
index 6540a6f..8093777 100755
--- a/dh_installman
+++ b/dh_installman
@@ -98,11 +98,12 @@ my @sodests;
 
 # PROMISE: DH NOOP WITHOUT manpages tmp(usr/share/man)
 
-foreach my $package (@{$dh{DOPACKAGES}}) {
+foreach my $package (getpackages()) {
 	next if is_udeb($package);
 
 	my $tmp=tmpdir($package);
 	my $file=pkgfile($package,"manpages");
+	my $skip_install=! grep { $_ eq $package } @{$dh{DOPACKAGES}};
 	my @manpages;
 
 	@manpages=filearray($file, ".") if $file;
@@ -111,6 +112,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		push @manpages, @ARGV;
 	}
 
+	log_installed_files($package, @manpages);
+
+	next if $skip_install;
+
 	foreach my $page (@manpages) {
 		my $basename=basename($page);
 
@@ -187,8 +192,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 
-	log_installed_files($package, @manpages);
-
 	# Now the .so conversion.
 	@sofiles=@sodests=();
 	foreach my $dir (qw{usr/share/man}) {

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