Mailing List Archive

[PATCH 2/4] acct-user.eclass: Fix for when building in a rooted prefix (EROOT)
Users are largely irrelevant for prefix, but we still don't want the
build to break.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
eclass/acct-user.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index b15599c5dd6f..538cc6ae8ec3 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -200,7 +200,7 @@ eislocked() {
# but we also expire the account which is more clear
local shadow
if [[ -n "${ROOT}" ]]; then
- shadow=$(grep "^$1:" "${ROOT}/etc/shadow")
+ shadow=$(grep "^$1:" "${EROOT}/etc/shadow")
else
shadow=$(getent shadow "$1")
fi
@@ -362,7 +362,7 @@ acct-user_pkg_preinst() {
fi

if [[ -n ${ROOT} ]]; then
- opts+=( --prefix "${ROOT}" )
+ opts+=( --prefix "${EROOT}" )
fi

elog "Adding user ${ACCT_USER_NAME}"
@@ -431,7 +431,7 @@ acct-user_pkg_postinst() {
fi

if [[ -n ${ROOT} ]]; then
- opts+=( --prefix "${ROOT}" )
+ opts+=( --prefix "${EROOT}" )
fi

elog "Updating user ${ACCT_USER_NAME}"
@@ -483,7 +483,7 @@ acct-user_pkg_prerm() {
)

if [[ -n ${ROOT} ]]; then
- opts+=( --prefix "${ROOT}" )
+ opts+=( --prefix "${EROOT}" )
fi

elog "Locking user ${ACCT_USER_NAME}"
--
2.38.1