summaryrefslogtreecommitdiff
path: root/dh_bugfiles
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2015-05-07 19:59:12 +0200
committerNiels Thykier <niels@thykier.net>2015-05-07 19:59:12 +0200
commit9559339b2b9d551bd836d67a76f50598148d2d16 (patch)
treeeda8b3f085958b645bb83a2f249a78388f9243d0 /dh_bugfiles
parentfdf61f73fcdca21c5bf18a64b05288af6086a170 (diff)
downloaddebhelper-9559339b2b9d551bd836d67a76f50598148d2d16.tar.gz
dh_bugfiles: Correct regression in installing bug-script
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'dh_bugfiles')
-rwxr-xr-xdh_bugfiles13
1 files changed, 9 insertions, 4 deletions
diff --git a/dh_bugfiles b/dh_bugfiles
index 0b5edf0e..81e36754 100755
--- a/dh_bugfiles
+++ b/dh_bugfiles
@@ -77,7 +77,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
next if is_udeb($package);
my $tmp=tmpdir($package);
- my $dir="$tmp/usr/share/bug/$package";
+ my $p_dir="${tmp}/usr/share/bug";
+ my $dir="${p_dir}/$package";
# Gather information which bug files are available for the
# package in question
@@ -95,8 +96,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# If there is only a bug script to install, install it as
# usr/share/bug/$package (unless this path is a directory)
if (! -d $dir && scalar(keys(%bugfiles)) == 1 && exists $bugfiles{script}) {
- install_dir($dir);
- install_file($bugfiles{script}, $dir);
+ install_dir($p_dir);
+ install_prog($bugfiles{script}, $dir);
}
elsif (scalar(keys(%bugfiles)) > 0) {
if (-f $dir) {
@@ -109,7 +110,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
install_dir($dir);
}
while (my ($type, $srcfile) = each(%bugfiles)) {
- install_file($srcfile, "$dir/$type");
+ if ($type eq 'script') {
+ install_prog($srcfile, "$dir/$type");
+ } else {
+ install_file($srcfile, "$dir/$type");
+ }
}
}