[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     484e7450d7df7739fd0902b8f17118110872a852
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 23:48:44 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 24 23:50:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=484e7450

acct-user.eclass: handle ACCT_USER_HOME_OWNER with no group

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/acct-user.eclass | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index 5160a6d21e1d..8cf56cb697a6 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -380,8 +380,15 @@ acct-user_pkg_preinst() {
                                group=${_ACCT_USER_HOME_OWNER#*:}
                        fi
                        local euid= egid=
-                       [[ -z ${user} ]] || euid=$(egetent passwd "${user}" | 
cut -d: -f3)
-                       [[ -z ${group} ]] || egid=$(egetent group "${group}" | 
cut -d: -f3)
+                       if [[ -n ${user} ]]; then
+                               euid=$(egetent passwd "${user}" | cut -d: -f3)
+                               if [[ -z ${group} ]]; then
+                                       egid=$(egetent passwd "${user}" | cut 
-d: -f4)
+                               fi
+                       fi
+                       if [[ -n ${group} ]]; then
+                               egid=$(egetent group "${group}" | cut -d: -f3)
+                       fi
                        _ACCT_USER_HOME_OWNER=${euid}:${egid}
                elif [[ -z ${_ACCT_USER_HOME_OWNER} ]]; then
                        _ACCT_USER_HOME_OWNER=${user}:${group}