[debhelper-devel] [debhelper] 01/01: dh_strip: Make --dbg-package run in serial

[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 268dc4a0951069a33c196ee19982205e4910f8ab
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Aug 26 09:12:00 2017 +0000

    dh_strip: Make --dbg-package run in serial
    
    Ideally, people would migrate to the automatic dbgsym packages, which
    do not seem trigger this problem.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |  3 +++
 dh_strip         | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a38f40..516e9e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,9 @@ debhelper (10.7.3) UNRELEASED; urgency=medium
     symlink_to_dir and dir_to_symlink maintscripts.  The version
     requirements are satisfied in oldoldstable.
   * dh_installdocs: Merge two chmod calls to save a fork+exec.
+  * dh_strip: Disable parallelism when --dbg-package is used as it
+    causes non-deterministic failures in some cases.  Thanks to
+    Helmut Grohne for reporting the issue.  (Closes: #872007)
 
   [ Geoffrey Thomas ]
   * Support building debhelper on case-insensitive filesystems by
diff --git a/dh_strip b/dh_strip
index 4de68e8..beca220 100755
--- a/dh_strip
+++ b/dh_strip
@@ -297,7 +297,7 @@ sub attach_debug {
 
 my %all_packages = map { $_ => 1 } getpackages();
 
-on_pkgs_in_parallel {
+sub process_packages {
 	foreach my $package (@_) {
 		my $tmp=tmpdir($package);
 
@@ -395,7 +395,15 @@ on_pkgs_in_parallel {
 			close($fd) or error("close $path failed: $!");
 		}
 	}
-};
+}
+
+if ($dh{DEBUGPACKAGE}) {
+	# Non-deterministic issues with --dbg-package and parallelism (see
+	# #872007).  Analysis and patches welcome for this case.
+	process_packages(@{$dh{DOPACKAGES}});
+} else {
+	on_pkgs_in_parallel(\&process_packages);
+}
 
 =head1 SEE ALSO
 

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