diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | dh_installinit | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 5afde2ef..b100e08e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ debhelper (7.4.9) UNRELEASED; urgency=low * Typo. Closes: #558654 + * dh_installinit: Fix installation of defaults file when an upstart job is + installed. Closes: #558782 -- Joey Hess <joeyh@debian.org> Sun, 29 Nov 2009 14:06:48 -0500 diff --git a/dh_installinit b/dh_installinit index 7b1d2e20..c053132e 100755 --- a/dh_installinit +++ b/dh_installinit @@ -177,7 +177,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } my $job=pkgfile($package,"upstart"); - my ($init,$default) = ('',''); + my $init=''; if ($job ne '' || ($dh{ONLYSCRIPTS} && -e "$tmp/etc/init/$jobfile.conf")) { if (! $dh{ONLYSCRIPTS}) { @@ -200,9 +200,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) { else { $init=pkgfile($package,$script) || pkgfile($package,"init") || pkgfile($package,"init.d"); - $default=pkgfile($package,'default'); } + my $default=pkgfile($package,'default'); if ($default ne '' && ! $dh{ONLYSCRIPTS}) { if (! -d "$tmp/etc/default") { doit("install","-d","$tmp/etc/default"); @@ -218,8 +218,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script"); } - if ($job ne '' || $init ne '' || $dh{ONLYSCRIPTS}) - { + if ($job ne '' || $init ne '' || $dh{ONLYSCRIPTS}) { if (-e "$tmp/etc/init/$jobfile.conf") { $script=$jobfile; } |