summaryrefslogtreecommitdiff
path: root/dh_strip
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2016-06-14 18:23:45 +0000
committerNiels Thykier <niels@thykier.net>2016-06-15 19:17:10 +0000
commit01480c11661204b6833608317928a6365e8a4cc4 (patch)
tree9ac12713c36ab3ab19bdd192ae4ec21b03b65da9 /dh_strip
parent615b11be1b4883869ed3ef5747f9e5ad4345e955 (diff)
Replace $dh{DEBUGPACKAGES} with $dh{DEBUGPACKAGE}
All uses are now singular, so change the code to only accept one package (the latest passed) and only store one value. The original $dh{DEBUGPACKAGES} is preserved for backwards compatibility (e.g. dh_clistrip uses it), although it will now always have at most one value in the array. Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'dh_strip')
-rwxr-xr-xdh_strip8
1 files changed, 4 insertions, 4 deletions
diff --git a/dh_strip b/dh_strip
index 615ba1c8..6ac02277 100755
--- a/dh_strip
+++ b/dh_strip
@@ -294,9 +294,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $keep_debug=$dh{K_FLAG};
my $debugtmp=$tmp;
my $use_build_id = compat(8) ? 0 : 1;
- if (ref $dh{DEBUGPACKAGES}) {
+ if ($dh{DEBUGPACKAGE}) {
$keep_debug=1;
- my $debugpackage=@{$dh{DEBUGPACKAGES}}[0];
+ my $debugpackage=$dh{DEBUGPACKAGE};
if (!$all_packages{$debugpackage}) {
error("debug package $debugpackage is not listed in the control file");
}
@@ -360,12 +360,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
close($fd) or error("close $path failed: $!");
}
}
- if (@build_ids && ($use_build_id > 1 || ref($dh{DEBUGPACKAGES}))) {
+ if (@build_ids && ($use_build_id > 1 || $dh{DEBUGPACKAGE})) {
my ($dir, $path);
if ($use_build_id > 1) {
$dir = "debian/.debhelper/${package}";
} else {
- my $dbg_pkg = @{$dh{DEBUGPACKAGES}}[0];
+ my $dbg_pkg = $dh{DEBUGPACKAGE};
$dir = "debian/.debhelper/${dbg_pkg}";
}
$path = "${dir}/dbgsym-build-ids";