diff options
| author | Niels Thykier <niels@thykier.net> | 2017-08-06 14:56:40 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2017-08-06 14:56:43 +0000 |
| commit | 7215e035497233aefd8350d00a1efa4a2a7157b6 (patch) | |
| tree | 839b14dfda2b71887122948de09afbbcb41927a3 /dh_installman | |
| parent | 128e320297653e52bf7c9e9085ff65e66544c22a (diff) | |
| download | debhelper-7215e035497233aefd8350d00a1efa4a2a7157b6.tar.gz | |
dh_install*: Accept missing files for packages not built
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'dh_installman')
| -rwxr-xr-x | dh_installman | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dh_installman b/dh_installman index cfaa6bc0..947abe61 100755 --- a/dh_installman +++ b/dh_installman @@ -141,11 +141,11 @@ init(options => { my (@sofiles, @sodests); my @all_packages = getpackages(); -my $error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject; +my $default_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; +$default_error_handler = \&glob_expand_error_handler_silently_ignore if $nodocs; on_items_in_parallel(\@all_packages, sub { @@ -156,6 +156,8 @@ on_items_in_parallel(\@all_packages, sub { my $file = pkgfile($package, "manpages"); my @manpages; my @search_dirs = ('.'); + my $skip_install = process_pkg($package) ? 0 : 1; + my $error_handler = $skip_install ? \&glob_expand_error_handler_silently_ignore : $default_error_handler; @search_dirs = ($dh{SOURCEDIR} // '.', default_sourcedir($package)) if not compat(10); @manpages = filearray($file, \@search_dirs, $error_handler) if $file; @@ -166,7 +168,7 @@ on_items_in_parallel(\@all_packages, sub { log_installed_files($package, @manpages); - next if not process_pkg($package) or $nodocs; + next if $skip_install or $nodocs; foreach my $page (@manpages) { my $basename = basename($page); |