summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2019-09-08 13:22:04 +0000
committerNiels Thykier <niels@thykier.net>2019-09-08 13:22:04 +0000
commit75639d0f64005ca72d84b8378ce24fe3ea1818ce (patch)
tree05dc0b99990b658fd1cd11db0d47a045251f44f3
parent6d66f6c0000b2885313e643593eeb85d0e9860da (diff)
downloaddebhelper-75639d0f64005ca72d84b8378ce24fe3ea1818ce.tar.gz
dh_strip: Avoid impossible copy manual dbg pkgs + dh_dwz
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog3
-rwxr-xr-xdh_strip2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 11f284e4..53079f76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debhelper (12.6) UNRELEASED; urgency=medium
trigger a rejection of the "generated" shlibs file (despite
dh_makeshlibs not generating any "shlibs" files).
(Closes: #939635)
+ * dh_strip: Avoid impossible copy of .../debug/.dwz/ to itself
+ when a manual debug package contained ELF files and was
+ processed by dh_dwz before dh_strip. (Closes: #939164)
[ Sven Joachim ]
* Split debhelper into debhelper (the tools) and libdebhelper-perl
diff --git a/dh_strip b/dh_strip
index ab876360..d7bf2399 100755
--- a/dh_strip
+++ b/dh_strip
@@ -379,7 +379,7 @@ sub process_packages {
doit($strip, '--strip-debug', '--remove-section=.comment',
'--remove-section=.note', '--enable-deterministic-archives', $_);
}
- if (-d "$tmp/usr/lib/debug/.dwz" and ($use_build_id > 1 or $dh{DEBUGPACKAGE})) {
+ if (-d "$tmp/usr/lib/debug/.dwz" and ($use_build_id > 1 or ($dh{DEBUGPACKAGE} and $dh{DEBUGPACKAGE} ne $package))) {
my @files = glob_expand(["$tmp/usr/lib/debug/.dwz"], \&glob_expand_error_handler_reject, '*');
install_dir("$debugtmp/usr/lib/debug/.dwz");
xargs(\@files, 'cp', '--reflink=auto', "-a", XARGS_INSERT_PARAMS_HERE, "$debugtmp/usr/lib/debug/.dwz");