Gentoo Archives: gentoo-pms

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-pms@l.g.o
Subject: [gentoo-pms] [PATCH] doins, dodoc: Clarify how directories are created.
Date: Tue, 01 Oct 2019 10:05:50
Message-Id: w6go8z0kcgd.fsf@kph.uni-mainz.de
1 With the -r option, it was unspecified what the mode of any created
2 directories is. Clarify that doins -r will create them as if dodir was
3 called (i.e., respect diropts), and that dodoc -r will create them as
4 if plain install -d was used.
5
6 For doins, this agrees with package manager implementations.
7
8 For dodoc, this agrees with historic Paludis behaviour. Portage
9 behaviour has changed in the past, when dodoc was changed from a
10 standalone helper to reusing parts of doins. Usage in the Gentoo
11 repository indicates that no ebuilds call diropts specifically for
12 installing of documentation. However, for several ebuilds dodoc -r is
13 affected by diropts called previously for another directory, which
14 looks like an unwanted side effect.
15
16 Signed-off-by: Ulrich Müller <ulm@g.o>
17 ---
18 pkg-mgr-commands.tex | 11 ++++++-----
19 1 file changed, 6 insertions(+), 5 deletions(-)
20
21 diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
22 index 9aacc70..00ae3a7 100644
23 --- a/pkg-mgr-commands.tex
24 +++ b/pkg-mgr-commands.tex
25 @@ -448,7 +448,8 @@ the current phase function has returned.
26 directory \t{/usr/share/doc/\$\{PF\}/}. For EAPIs listed in table~\ref{tab:dodoc-table}
27 as supporting \t{-r}, if the first argument is \t{-r}, any subsequent arguments that are
28 directories are installed recursively to the appropriate location; in any other case, it is
29 - an error for a directory to be specified. Failure behaviour is EAPI dependent as per
30 + an error for a directory to be specified. Any directories that don't already exist are created
31 + using \t{install -d} with no additional options. Failure behaviour is EAPI dependent as per
32 section~\ref{sec:failure-behaviour}.
33
34 \item[doenvd] Installs the given environment files into \t{/etc/env.d/}, by default with file mode
35 @@ -509,10 +510,10 @@ the current phase function has returned.
36 \item[doins] \featurelabel{doins} Takes one or more files as arguments and installs them into
37 \t{INSDESTTREE}, by default with file mode \t{0644}, or with the \t{install} options set by
38 the most recent \t{insopts} call. If the first argument is \t{-r}, then operates recursively,
39 - descending into any directories given. For EAPIs listed in table~\ref{tab:doins-table},
40 - \t{doins} must install symlinks as symlinks; for other EAPIs, behaviour is undefined if any
41 - symlink is encountered. Failure behaviour is EAPI dependent as per
42 - section~\ref{sec:failure-behaviour}.
43 + descending into any directories given. Any directories are created as if \t{dodir} was called.
44 + For EAPIs listed in table~\ref{tab:doins-table}, \t{doins} must install symlinks as symlinks;
45 + for other EAPIs, behaviour is undefined if any symlink is encountered. Failure behaviour is
46 + EAPI dependent as per section~\ref{sec:failure-behaviour}.
47
48 \item[dolib.a] For each argument, installs it into the appropriate library subdirectory under
49 \t{DESTTREE}, as determined by algorithm~\ref{alg:ebuild-libdir}. Files are installed with file
50 --
51 2.23.0

Attachments

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

Replies