[debhelper-devel] [debhelper] 04/07: dh_strip: Skip ddeb generation with -k or explicit -dbg pkg

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to annotated tag 9.20150502+ddebs
in repository debhelper.

commit bcc6d148a86e0f9036e2f6f027c9b804f30080ca
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 11 05:13:59 2015 +0200

    dh_strip: Skip ddeb generation with -k or explicit -dbg pkg
    
    Add a missing check for explicit -dbg packages (or a -k flag), which
    was meant to inhibit the creation of ddebs.
    
    Reported-by: Reiner Herrmann <reiner at reiner-h.de>
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_strip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dh_strip b/dh_strip
index a23b614..d4da5f9 100755
--- a/dh_strip
+++ b/dh_strip
@@ -218,7 +218,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$debugtmp=tmpdir($package."-dbg");
 		}
 	}
-	if ($ENV{'DH_BUILD_DDEBS'} and package_arch($package) ne 'all') {
+	if ($ENV{'DH_BUILD_DDEBS'} and not $keep_debug and package_arch($package) ne 'all') {
 		$debugtmp = "debian/.debhelper/${package}/ddeb-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