[debhelper-devel] [debhelper] 03/03: dh_missing: Be more verbose about missing files

[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 950afa22649c998c308c30a0e3fa2b3f7b8b635d
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 8 10:26:54 2017 +0000

    dh_missing: Be more verbose about missing files
    
    Plus mention that dpkg-buildpackage -A/-B may give different results.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_missing | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/dh_missing b/dh_missing
index fb3e4d8..b576991 100755
--- a/dh_missing
+++ b/dh_missing
@@ -27,6 +27,10 @@ do nothing.
 This may be useful if you have a large package and want to make sure that
 you don't miss installing newly added files in new upstream releases.
 
+Remember to test different kinds of builds (dpkg-buildpackage -A/-B/...) as
+you may experience varying results when only a subset of the packages are
+built.
+
 =head1 FILES
 
 =over 4
@@ -99,13 +103,22 @@ if (! -d $srcdir) {
 }
 
 for my $file (<debian/.debhelper/generated/*/installed-by-*>) {
-	my $helper = $file =~ s at .*/installed-by-@@r;
-	$helpers{$helper} = 1;
+	my ($target_pkg, $helper) = ('unknown', 'unknown');
+	my $had_files = 0;
+	my %seen;
+	if ($file =~ m at .*/([^/]+)/installed-by-(.*)@) {
+		($target_pkg, $helper) = ($1, $2);
+	}
+
 	open(my $fh, '<', $file) or die "could not open $file: $!";
 	while (my $line = <$fh>) {
 		chomp($line);
+		next if $line =~ m/^\s*$/;
+		next if $seen{$line}++; # Ignore duplicates
+		$had_files++;
 		push(@installed, $line);
 	}
+	$helpers{$helper}{$target_pkg} = $had_files;
 	close($fh);
 }
 
@@ -137,11 +150,18 @@ find(sub {
 }, $srcdir);
 if (@missing) {
 	warning "$_ exists in $srcdir but is not installed to anywhere" foreach @missing;
-	nonquiet_print("The following debhelper tools have reported what they installed");
+	nonquiet_print("The following debhelper tools have reported what they installed (with files per package)");
 	for my $helper (sort(keys(%helpers))) {
-		nonquiet_print(" * ${helper}");
+		my $pkg_info = $helpers{$helper};
+		my @results;
+		for my $pkg (sort(keys(%{$pkg_info}))) {
+			my $no = $pkg_info->{$pkg};
+			push(@results, "${pkg} (${no})")
+		}
+		nonquiet_print(" * ${helper}: " . join(', ', @results));
 	}
-	nonquiet_print("If the missing files are installed by another tool, please file a bug against it");
+	nonquiet_print("If the missing files are installed by another tool, please file a bug against it.");
+	nonquiet_print("Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built");
 	nonquiet_print("For a short-term work-around: Add the files to debian/not-installed");
 	if ($dh{FAIL_MISSING}) {
 		error("missing files, aborting");

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