[debhelper-devel] [debhelper] 01/01: dh_strip: Do not assume Build-Id is present

[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 78cda72eb36687f993d5b2651544a1b0d7b43505
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Dec 3 13:26:48 2015 +0000

    dh_strip: Do not assume Build-Id is present
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_strip         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cee33e6..7bdc8cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ debhelper (9.20151126+unreleased) UNRELEASED; urgency=medium
     modifier when substituting the auto-script snippets.
   * dh_*: Add /g when substituting the auto-script snippts in
     other commands as well.
+  * dh_strip: Do not assume that ELF binaries have a Build-Id.
+    Thanks to Helmut Grohne for spotting this issue.
+    (Closes: #806814)
 
  -- Niels Thykier <niels at thykier.net>  Sat, 28 Nov 2015 09:18:02 +0100
 
diff --git a/dh_strip b/dh_strip
index 519946a..89c091f 100755
--- a/dh_strip
+++ b/dh_strip
@@ -266,7 +266,7 @@ sub make_debug {
 		doit($objcopy, "--only-keep-debug", "--compress-debug-sections", $file, $debug_path);
 	}
 
-	if ($use_build_id) {
+	if ($use_build_id and defined($debug_build_id)) {
 		push(@build_ids, $debug_build_id);
 	}
 

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