[debhelper-devel] [debhelper] 01/01: dh_installdocs: Make -A neuter main-doc package auto-detection

[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 75518fac07c402443d76deebf84730bf47ca5684
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jan 24 19:58:40 2018 +0000

    dh_installdocs: Make -A neuter main-doc package auto-detection
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_installdocs   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1a628fa..63d449d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debhelper (11.1.4) UNRELEASED; urgency=medium
   * qmake.pm/qmake4.pm: Avoid global state in the build systems.
   * dh_makeshlibs: Fix --no-act, which could still cause writes
     to the shlibs file.  Thanks to Sven Joachim for reporting it.
+  * dh_installdocs: Discard auto-detected main doc package when
+    passed -A/--all as it causes file-conflicts.
+    (Closes: #886108, #888294)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 21 Jan 2018 08:18:20 +0000
 
diff --git a/dh_installdocs b/dh_installdocs
index 867d34a..1f26205 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -289,6 +289,9 @@ foreach my $package (getpackages()) {
 		if (not defined($target_package)) {
 			warning("Cannot auto-detect main package for ${package}.  If the default is wrong, please use --doc-main-package");
 			$target_package = $package;
+		} elsif ($dh{PARAMS_ALL} and $package ne $target_package and not $dh{DOC_MAIN_PACKAGE}) {
+			warning("Not using auto-detected $target_package as main doc package for $package: With -A/--all, this would cause file-conflicts.");
+			$target_package = $package;
 		}
 		if ($dh{EXCLUDE_FIND}) {
 			$exclude .= ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';

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