Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-dev] [PATCH] user.eclass: Avoid reserved function name
Date: Sun, 15 May 2022 07:42:07
Message-Id: 20220515074151.14493-1-ulm@gentoo.org
1 Names that contain "ebuild" are reserved for package manager use.
2
3 Closes: https://bugs.gentoo.org/843707
4 Signed-off-by: Ulrich Müller <ulm@g.o>
5 ---
6 eclass/user.eclass | 16 ++++++++--------
7 1 file changed, 8 insertions(+), 8 deletions(-)
8
9 diff --git a/eclass/user.eclass b/eclass/user.eclass
10 index aab549d0c473..93512d37d055 100644
11 --- a/eclass/user.eclass
12 +++ b/eclass/user.eclass
13 @@ -31,12 +31,12 @@ _USER_ECLASS=1
14
15 inherit user-info
16
17 -# @FUNCTION: _assert_pkg_ebuild_phase
18 +# @FUNCTION: _assert_pkg_phase
19 # @INTERNAL
20 # @USAGE: <calling func name>
21 # @DESCRIPTION:
22 # Raises an alert if the phase is not suitable for user.eclass usage.
23 -_assert_pkg_ebuild_phase() {
24 +_assert_pkg_phase() {
25 case ${EBUILD_PHASE} in
26 setup|preinst|postinst|prerm|postrm) ;;
27 *)
28 @@ -89,7 +89,7 @@ enewuser() {
29 ewarn "Insufficient privileges to execute ${FUNCNAME[0]}"
30 return 0
31 fi
32 - _assert_pkg_ebuild_phase ${FUNCNAME}
33 + _assert_pkg_phase ${FUNCNAME}
34
35 local create_home=1 force_uid=
36 while [[ ${1} == -* ]]; do
37 @@ -262,7 +262,7 @@ enewgroup() {
38 ewarn "Insufficient privileges to execute ${FUNCNAME[0]}"
39 return 0
40 fi
41 - _assert_pkg_ebuild_phase ${FUNCNAME}
42 + _assert_pkg_phase ${FUNCNAME}
43
44 local force_gid=
45 while [[ ${1} == -* ]]; do
46 @@ -365,7 +365,7 @@ enewgroup() {
47 # If the new home directory does not exist, it is created.
48 # Any previously existing home directory is NOT moved.
49 esethome() {
50 - _assert_pkg_ebuild_phase ${FUNCNAME}
51 + _assert_pkg_phase ${FUNCNAME}
52
53 # get the username
54 local euser=${1}; shift
55 @@ -451,7 +451,7 @@ esethome() {
56 # Required parameters is the username and the new shell.
57 # Specify -1 if you want to set shell to platform-specific nologin.
58 esetshell() {
59 - _assert_pkg_ebuild_phase ${FUNCNAME}
60 + _assert_pkg_phase ${FUNCNAME}
61
62 # get the username
63 local euser=${1}; shift
64 @@ -528,7 +528,7 @@ esetshell() {
65 # Update the comment field in a platform-agnostic way.
66 # Required parameters is the username and the new comment.
67 esetcomment() {
68 - _assert_pkg_ebuild_phase ${FUNCNAME}
69 + _assert_pkg_phase ${FUNCNAME}
70
71 # get the username
72 local euser=${1}; shift
73 @@ -602,7 +602,7 @@ esetcomment() {
74 # Required parameters is the username and the new list of groups,
75 # primary group first.
76 esetgroups() {
77 - _assert_pkg_ebuild_phase ${FUNCNAME}
78 + _assert_pkg_phase ${FUNCNAME}
79
80 [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <user> <groups>"
81
82 --
83 2.35.1

Replies

Subject Author
[gentoo-dev] [PATCH v2] user.eclass: Avoid reserved function name "Ulrich Müller" <ulm@g.o>