diff options
| author | Niels Thykier <niels@thykier.net> | 2019-07-19 18:29:26 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2019-07-19 18:29:26 +0000 |
| commit | 38fcef8ad314aeedd1c698d8bb697158286cf989 (patch) | |
| tree | db94f8ed1d8ac7785fd8c2a801c16f6cdd437823 | |
| parent | f8ad9cd445f0e5722b60c678dde120400079bfc0 (diff) | |
| download | debhelper-38fcef8ad314aeedd1c698d8bb697158286cf989.tar.gz | |
dh_installinit: Revert check to ensure --name always matches a file
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | dh_installinit | 6 | ||||
| -rwxr-xr-x | t/dh_installinit/dh_installinit.t | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 77869569..f6cddf42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.2.3) UNRELEASED; urgency=medium + + * dh_installinit: Revert "Fail with an error if --name is given but + there is no matching init script.". (Closes: #932073, + Reopens: #462389) + + -- Niels Thykier <niels@thykier.net> Fri, 19 Jul 2019 18:27:41 +0000 + debhelper (12.2.2) unstable; urgency=medium * dh_shlibdeps: Remove regex anchor when parsing file(1) to aovid diff --git a/dh_installinit b/dh_installinit index 5aecf25b..fca0a8af 100755 --- a/dh_installinit +++ b/dh_installinit @@ -232,12 +232,6 @@ init(options => { my %snippet_options = ('snippet-order' => 'service'); -if (my $name = $dh{NAME}) { - if (!grep { -f "debian/$_.${name}.init" || -f "debian/$_.${name}.default" } @{$dh{DOPACKAGES}}) { - error("--name=$dh{NAME} option specified, but init script nor default file not found"); - } -} - foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); diff --git a/t/dh_installinit/dh_installinit.t b/t/dh_installinit/dh_installinit.t index 3b6bc038..cfc154a7 100755 --- a/t/dh_installinit/dh_installinit.t +++ b/t/dh_installinit/dh_installinit.t @@ -30,7 +30,6 @@ each_compat_from_and_above_subtest(11, sub { make_path(qw(debian/foo debian/bar debian/baz)); ok(run_dh_tool('dh_installinit')); - ok(! run_dh_tool({'quiet' => 1}, 'dh_installinit', '--name=missing')); ok( run_dh_tool({'queit' => 1}, 'dh_installinit', '--name=other')); ok(! -e "debian/foo/lib/systemd/system/foo.service"); ok(!find_script('foo', 'postinst')); |