Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Cc: James Le Cuirot <chewi@g.o>
Subject: [gentoo-dev] [PATCH 3/4] user-info.eclass: Fix for when building in a rooted prefix (EROOT)
Date: Tue, 06 Dec 2022 22:25:09
Message-Id: 20221206222414.13633-3-chewi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/4] acct-group.eclass: Fix for when building in a rooted prefix (EROOT) by James Le Cuirot
1 Users are largely irrelevant for prefix, but we still don't want the
2 build to break.
3
4 Signed-off-by: James Le Cuirot <chewi@g.o>
5 ---
6 eclass/user-info.eclass | 8 ++++----
7 1 file changed, 4 insertions(+), 4 deletions(-)
8
9 diff --git a/eclass/user-info.eclass b/eclass/user-info.eclass
10 index 5550e4f08eeb..1339e36634a8 100644
11 --- a/eclass/user-info.eclass
12 +++ b/eclass/user-info.eclass
13 @@ -48,7 +48,7 @@ egetent() {
14 fi
15
16 # Handle different ROOT
17 - [[ -n ${ROOT} ]] && opts+=( -R "${ROOT}" )
18 + [[ -n ${ROOT} ]] && opts+=( -R "${EROOT}" )
19
20 pw show ${db} ${opts} "${key}" -q
21 ;;
22 @@ -64,9 +64,9 @@ egetent() {
23 getent "${db}" "${key}"
24 else
25 if [[ ${key} =~ ^[[:digit:]]+$ ]]; then
26 - grep -E "^([^:]*:){2}${key}" "${ROOT}/etc/${db}"
27 + grep -E "^([^:]*:){2}${key}" "${EROOT}/etc/${db}"
28 else
29 - grep "^${key}:" "${ROOT}/etc/${db}"
30 + grep "^${key}:" "${EROOT}/etc/${db}"
31 fi
32 fi
33 ;;
34 @@ -167,7 +167,7 @@ egetgroups() {
35 local egroups_arr
36 if [[ -n "${ROOT}" ]]; then
37 local pgroup=$(egetent passwd "$1" | cut -d: -f1)
38 - local sgroups=( $(grep -E ":([^:]*,)?$1(,[^:]*)?$" "${ROOT}/etc/group" | cut -d: -f1) )
39 + local sgroups=( $(grep -E ":([^:]*,)?$1(,[^:]*)?$" "${EROOT}/etc/group" | cut -d: -f1) )
40
41 # Remove primary group from list
42 sgroups=${sgroups#${pgroup}}
43 --
44 2.38.1

Replies