Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] [PATCH] systemd.eclass: Improve systemd_install_serviced documentation
Date: Wed, 14 Jun 2017 07:42:29
Message-Id: 1497426126.1187.0.camel@gentoo.org
In Reply to: Re: [gentoo-dev] [PATCH] systemd.eclass: Improve systemd_install_serviced documentation by Mike Gilbert
1 On wto, 2017-06-13 at 22:52 -0400, Mike Gilbert wrote:
2 > On Tue, Jun 13, 2017 at 6:58 PM, Michał Górny <mgorny@g.o> wrote:
3 > > On nie, 2017-06-11 at 20:23 +0100, Chris Mayo wrote:
4 > > > Signed-off-by: Chris Mayo <aklhfex@×××××.com>
5 > > > ---
6 > > >
7 > > > Nothing added, just suggesting how it could be made easier to understand.
8 > > >
9 > > > Chris
10 > > >
11 > > > eclass/systemd.eclass | 10 +++++-----
12 > > > 1 file changed, 5 insertions(+), 5 deletions(-)
13 > > >
14 > > > diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
15 > > > index 7e46e80119c..49f7480228b 100644
16 > > > --- a/eclass/systemd.eclass
17 > > > +++ b/eclass/systemd.eclass
18 > > > @@ -178,12 +178,12 @@ systemd_newuserunit() {
19 > > > }
20 > > >
21 > > > # @FUNCTION: systemd_install_serviced
22 > > > -# @USAGE: <conf-file> [<service.d>]
23 > > > +# @USAGE: <conf-file> [<service>]
24 > > > # @DESCRIPTION:
25 > > > -# Install the file <conf-file> as service.d/00gentoo.conf template.
26 > > > -# The <service.d> argument specifies the configured service name.
27 > > > -# If not specified, the configuration file name will be used with .conf
28 > > > -# suffix stripped (e.g. foo.service.conf -> foo.service).
29 > > > +# Install <conf-file> as the template <service>.d/00gentoo.conf.
30 > > > +# If <service> is not specified
31 > > > +# <conf-file> with the .conf suffix stripped is used
32 > > > +# (e.g. foo.service.conf -> foo.service.d/00gentoo.conf).
33 > > > systemd_install_serviced() {
34 > > > debug-print-function ${FUNCNAME} "${@}"
35 > > >
36 > >
37 > > This is meritoriously wrong. The second argument is required to have
38 > > '.d' suffix, while your help text suggests that '.d' is appended
39 > > implicitly.
40 >
41 > WTF are you talking about?
42 >
43 > # avoid potentially common mistake
44 > [[ ${service} == *.d ]] && die "Service must not have .d suffix"
45 >
46
47 A thinko then. Nevermind.
48
49 --
50 Best regards,
51 Michał Górny

Attachments

File name MIME type
signature.asc application/pgp-signature