[debhelper-devel] [debhelper] 01/02: Create a helper for locating the dbgsym tmpdir

[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 690a2ecf83451f6bc048ec7ff59734ef13c0565b
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 21 09:39:44 2017 +0000

    Create a helper for locating the dbgsym tmpdir
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_builddeb                    | 4 ++--
 dh_gencontrol                  | 2 +-
 dh_md5sums                     | 2 +-
 dh_strip                       | 2 +-
 lib/Debian/Debhelper/Dh_Lib.pm | 7 ++++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dh_builddeb b/dh_builddeb
index a412789..c41fe4c 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -103,7 +103,7 @@ my @items;
 for my $package (@{$dh{DOPACKAGES}}) {
 	push(@items, [$package, 0]);
 	if (not is_udeb($package)) {
-		my $dbgsym_tmpdir = "debian/.debhelper/${package}/dbgsym-root";
+		my $dbgsym_tmpdir = dbgsym_tmpdir($package);
 		my $dbgsym_control = "${dbgsym_tmpdir}/DEBIAN/control";
 		if ( -f $dbgsym_control) {
 			# Only build the dbgsym package if it has a control file.
@@ -122,7 +122,7 @@ on_items_in_parallel(\@items, sub {
 		my $tmp=tmpdir($package);
 
 		if ($dbgsym) {
-			my $dbgsym_tmpdir = "debian/.debhelper/${package}/dbgsym-root";
+			my $dbgsym_tmpdir = dbgsym_tmpdir($package);
 			doit("dpkg-deb", @{$dh{U_PARAMS}},
 				"--build", $dbgsym_tmpdir, $dh{DESTDIR});
 			next;
diff --git a/dh_gencontrol b/dh_gencontrol
index bdbf178..271aa9a 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -88,7 +88,7 @@ on_pkgs_in_parallel {
 		my $tmp=tmpdir($package);
 		my $ext=pkgext($package);
 		my $dbgsym_info_dir = "debian/.debhelper/${package}";
-		my $dbgsym_tmp = "${dbgsym_info_dir}/dbgsym-root";
+		my $dbgsym_tmp = dbgsym_tmpdir($package);
 
 		my $substvars="debian/${ext}substvars";
 
diff --git a/dh_md5sums b/dh_md5sums
index c94f8f2..dea8e80 100755
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -55,7 +55,7 @@ on_pkgs_in_parallel {
 	foreach my $package (@_) {
 		next if is_udeb($package);
 
-		my $dbgsym_tmp = "debian/.debhelper/${package}/dbgsym-root";
+		my $dbgsym_tmp = dbgsym_tmpdir($package);
 		my $tmp=tmpdir($package);
 
 		install_dir("$tmp/DEBIAN");
diff --git a/dh_strip b/dh_strip
index c22e4db..139fb04 100755
--- a/dh_strip
+++ b/dh_strip
@@ -332,7 +332,7 @@ sub process_packages {
 			# Avoid creating a dbgsym that would clash with a registered
 			# package or looks like a manual -dbg package.
 			if (not $all_packages{"${package}-dbgsym"} and $package !~ m/-dbg(?:sym)?$/) {
-				$debugtmp = "debian/.debhelper/${package}/dbgsym-root";
+				$debugtmp = dbgsym_tmpdir($package);
 				$keep_debug = 1;
 				$use_build_id = 2;
 			}
diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index 167d5d2..54a545d 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -65,7 +65,7 @@ our (@EXPORT, %dh);
 	    &glob_expand_error_handler_silently_ignore DH_BUILTIN_VERSION
 	    &print_and_complex_doit &default_sourcedir &qx_cmd
 	    &compute_doc_main_package &is_so_or_exec_elf_file
-	    &assert_opt_is_known_package
+	    &assert_opt_is_known_package &dbgsym_tmpdir
 );
 
 # The Makefile changes this if debhelper is installed in a PREFIX.
@@ -2071,6 +2071,11 @@ sub compute_doc_main_package {
 	return;
 }
 
+sub dbgsym_tmpdir {
+	my ($package) = @_;
+	return "debian/.debhelper/${package}/dbgsym-root";
+}
+
 
 {
 	my %known_packages;

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