1 |
Replace 'einfo' calls with either 'elog' or 'ewarn'. Practically all |
2 |
messages printed by the eclass functions are important, in particular |
3 |
regarding account changes and lack of permissions. |
4 |
|
5 |
Signed-off-by: Michał Górny <mgorny@g.o> |
6 |
--- |
7 |
eclass/user.eclass | 40 ++++++++++++++++++++-------------------- |
8 |
1 file changed, 20 insertions(+), 20 deletions(-) |
9 |
|
10 |
diff --git a/eclass/user.eclass b/eclass/user.eclass |
11 |
index 9bd0b607eab8..a33915e21192 100644 |
12 |
--- a/eclass/user.eclass |
13 |
+++ b/eclass/user.eclass |
14 |
@@ -68,7 +68,7 @@ user_get_nologin() { |
15 |
# exist. |
16 |
enewuser() { |
17 |
if [[ ${EUID} != 0 ]] ; then |
18 |
- einfo "Insufficient privileges to execute ${FUNCNAME[0]}" |
19 |
+ ewarn "Insufficient privileges to execute ${FUNCNAME[0]}" |
20 |
return 0 |
21 |
fi |
22 |
_assert_pkg_ebuild_phase ${FUNCNAME} |
23 |
@@ -94,7 +94,7 @@ enewuser() { |
24 |
if [[ -n $(egetent passwd "${euser}") ]] ; then |
25 |
return 0 |
26 |
fi |
27 |
- einfo "Adding user '${euser}' to your system ..." |
28 |
+ elog "Adding user '${euser}' to your system ..." |
29 |
|
30 |
# options to pass to useradd |
31 |
local opts=() |
32 |
@@ -122,7 +122,7 @@ enewuser() { |
33 |
[[ ${euid} -ge 101 ]] || die "${FUNCNAME}: no free UID found" |
34 |
fi |
35 |
opts+=( -u ${euid} ) |
36 |
- einfo " - Userid: ${euid}" |
37 |
+ elog " - Userid: ${euid}" |
38 |
|
39 |
# handle shell |
40 |
local eshell=$1; shift |
41 |
@@ -138,7 +138,7 @@ enewuser() { |
42 |
else |
43 |
eshell=$(user_get_nologin) |
44 |
fi |
45 |
- einfo " - Shell: ${eshell}" |
46 |
+ elog " - Shell: ${eshell}" |
47 |
opts+=( -s "${eshell}" ) |
48 |
|
49 |
# handle homedir |
50 |
@@ -146,7 +146,7 @@ enewuser() { |
51 |
if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then |
52 |
ehome="/dev/null" |
53 |
fi |
54 |
- einfo " - Home: ${ehome}" |
55 |
+ elog " - Home: ${ehome}" |
56 |
opts+=( -d "${ehome}" ) |
57 |
|
58 |
# handle groups |
59 |
@@ -171,7 +171,7 @@ enewuser() { |
60 |
opts+=( -G "${exgroups:1}" ) |
61 |
fi |
62 |
fi |
63 |
- einfo " - Groups: ${egroups:-(none)}" |
64 |
+ elog " - Groups: ${egroups:-(none)}" |
65 |
|
66 |
# handle extra args |
67 |
if [[ $# -gt 0 ]] ; then |
68 |
@@ -179,7 +179,7 @@ enewuser() { |
69 |
else |
70 |
local comment="added by portage for ${PN}" |
71 |
opts+=( -c "${comment}" ) |
72 |
- einfo " - GECOS: ${comment}" |
73 |
+ elog " - GECOS: ${comment}" |
74 |
fi |
75 |
|
76 |
# add the user |
77 |
@@ -204,7 +204,7 @@ enewuser() { |
78 |
esac |
79 |
|
80 |
if [[ -n ${create_home} && ! -e ${ROOT}/${ehome} ]] ; then |
81 |
- einfo " - Creating ${ehome} in ${ROOT}" |
82 |
+ elog " - Creating ${ehome} in ${ROOT}" |
83 |
mkdir -p "${ROOT}/${ehome}" |
84 |
chown "${euser}" "${ROOT}/${ehome}" |
85 |
chmod 755 "${ROOT}/${ehome}" |
86 |
@@ -223,7 +223,7 @@ enewuser() { |
87 |
# can not be assigned. |
88 |
enewgroup() { |
89 |
if [[ ${EUID} != 0 ]] ; then |
90 |
- einfo "Insufficient privileges to execute ${FUNCNAME[0]}" |
91 |
+ ewarn "Insufficient privileges to execute ${FUNCNAME[0]}" |
92 |
return 0 |
93 |
fi |
94 |
_assert_pkg_ebuild_phase ${FUNCNAME} |
95 |
@@ -248,7 +248,7 @@ enewgroup() { |
96 |
if [[ -n $(egetent group "${egroup}") ]] ; then |
97 |
return 0 |
98 |
fi |
99 |
- einfo "Adding group '${egroup}' to your system ..." |
100 |
+ elog "Adding group '${egroup}' to your system ..." |
101 |
|
102 |
# handle gid |
103 |
local egid=$1; shift |
104 |
@@ -266,7 +266,7 @@ enewgroup() { |
105 |
[[ -n ${force_gid} ]] && die "${FUNCNAME}: -F with gid==-1 makes no sense" |
106 |
egid="next available" |
107 |
fi |
108 |
- einfo " - Groupid: ${egid}" |
109 |
+ elog " - Groupid: ${egid}" |
110 |
|
111 |
# handle extra |
112 |
if [[ $# -gt 0 ]] ; then |
113 |
@@ -351,12 +351,12 @@ esethome() { |
114 |
return 0 |
115 |
fi |
116 |
|
117 |
- einfo "Updating home for user '${euser}' ..." |
118 |
- einfo " - Home: ${ehome}" |
119 |
+ elog "Updating home for user '${euser}' ..." |
120 |
+ elog " - Home: ${ehome}" |
121 |
|
122 |
# ensure home directory exists, otherwise update will fail |
123 |
if [[ ! -e ${ROOT}/${ehome} ]] ; then |
124 |
- einfo " - Creating ${ehome} in ${ROOT}" |
125 |
+ elog " - Creating ${ehome} in ${ROOT}" |
126 |
mkdir -p "${ROOT}/${ehome}" |
127 |
chown "${euser}" "${ROOT}/${ehome}" |
128 |
chmod 755 "${ROOT}/${ehome}" |
129 |
@@ -420,8 +420,8 @@ esetshell() { |
130 |
return 0 |
131 |
fi |
132 |
|
133 |
- einfo "Updating shell for user '${euser}' ..." |
134 |
- einfo " - Shell: ${eshell}" |
135 |
+ elog "Updating shell for user '${euser}' ..." |
136 |
+ elog " - Shell: ${eshell}" |
137 |
|
138 |
# update the shell |
139 |
case ${CHOST} in |
140 |
@@ -476,8 +476,8 @@ esetcomment() { |
141 |
return 0 |
142 |
fi |
143 |
|
144 |
- einfo "Updating comment for user '${euser}' ..." |
145 |
- einfo " - Comment: ${ecomment}" |
146 |
+ elog "Updating comment for user '${euser}' ..." |
147 |
+ elog " - Comment: ${ecomment}" |
148 |
|
149 |
# update the comment |
150 |
case ${CHOST} in |
151 |
@@ -546,8 +546,8 @@ esetgroups() { |
152 |
fi |
153 |
|
154 |
local opts=( -g "${defgroup}" -G "${exgroups}" ) |
155 |
- einfo "Updating groups for user '${euser}' ..." |
156 |
- einfo " - Groups: ${egroups}" |
157 |
+ elog "Updating groups for user '${euser}' ..." |
158 |
+ elog " - Groups: ${egroups}" |
159 |
|
160 |
# update the group |
161 |
case ${CHOST} in |
162 |
-- |
163 |
2.25.0 |