summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2019-08-16 10:53:15 +0000
committerNiels Thykier <niels@thykier.net>2019-08-16 10:53:15 +0000
commit28a7dd491b45c849ed8b09b73ecaba6202dd7e04 (patch)
tree0015aab4177a1280b7fa239d6c2d271e3272b3e7
parent65e04527b7e0b967424caf91743c430b7c1e039d (diff)
downloaddebhelper-28a7dd491b45c849ed8b09b73ecaba6202dd7e04.tar.gz
dh_makeshlibs: Fix bug in --no-add-udeb
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog2
-rwxr-xr-xdh_makeshlibs4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ade017e8..301eeed0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ debhelper (12.5) UNRELEASED; urgency=medium
compat level specified both as a build-dependency and in
debian/compat. Thanks to Alessandro Grassi for reporting the issue
on IRC.
+ * dh_makeshlibs: Fix bug where --no-add-udeb could trigger the
+ auto-detection code.
[ Frank Schaefer ]
* dh_installmodules: Also lok for compressed kernel modules
diff --git a/dh_makeshlibs b/dh_makeshlibs
index cc1f864a..12581771 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -241,8 +241,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
$exclude="! \\( $dh{EXCLUDE_FIND} \\) ";
}
- if (defined($shlibs_udeb) && $shlibs_udeb ne '') {
- $udeb_name = $shlibs_udeb;
+ if (defined($shlibs_udeb)) {
+ $udeb_name = $shlibs_udeb if $shlibs_udeb ne '';
} else {
my $guessed_udeb = "${package}-udeb";
$udeb_name = $guessed_udeb if is_known_package($guessed_udeb) and is_udeb($guessed_udeb);