[debhelper-devel] [debhelper] 01/01: dh_strip: Correct dbgsym creation check

[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 d3801d1eefb6b4357954576bd086ac832b708110
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Apr 30 14:09:15 2017 +0000

    dh_strip: Correct dbgsym creation check
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_strip         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 938f2c2..ee3343d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ debhelper (10.3) UNRELEASED; urgency=medium
   * dh_gencontrol: Avoid adding Homepage fields to dbgsym packages.  Avoids
     non-overridable warnings from lintian when there is an issue in the
     homepage field of the original binary.  (Closes: #812248)
+  * dh_strip: Fix a check that could cause dh_strip to generate dbgsym
+    packages when it should not.
 
   [ Steven Chamberlain ]
   * When cross-compiling for GNU/kFreeBSD host systems, set
diff --git a/dh_strip b/dh_strip
index a8638f1..d776068 100755
--- a/dh_strip
+++ b/dh_strip
@@ -316,7 +316,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if ($dh{ENABLE_DBGSYM} and not $keep_debug and package_arch($package) ne 'all' and not is_udeb($package)) {
 		# Avoid creating a dbgsym that would clash with a registered
 		# package or looks like a manual -dbg package.
-		if (not $all_packages{"${package}-dbgsym"} or $package =~ m/-dbg$/) {
+		if (not $all_packages{"${package}-dbgsym"} and $package !~ m/-dbg(?:sym)?$/) {
 			$debugtmp = "debian/.debhelper/${package}/dbgsym-root";
 			$keep_debug = 1;
 			$use_build_id = 2;

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