From f646424fdc41fc57d6fbb152cb6fd76b0fca969e Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Thu, 30 Jul 2026 17:45:52 -0400 Subject: [PATCH] acct-user.eclass: use edo to echo commands Signed-off-by: Mike Gilbert --- eclass/acct-user.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index 273130ea19af5..76046988849be 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -51,6 +51,10 @@ esac inherit user-info +case ${EAPI} in + 7|8) inherit edo ;; +esac + [[ ${CATEGORY} == acct-user ]] || die "Ebuild error: this eclass can be used only in acct-user category!" @@ -340,7 +344,7 @@ acct-user_pkg_preinst() { fi elog "Adding user ${ACCT_USER_NAME}" - useradd "${opts[@]}" "${ACCT_USER_NAME}" || die "useradd failed with status $?" + nonfatal edo useradd "${opts[@]}" "${ACCT_USER_NAME}" || die "useradd failed with status $?" _ACCT_USER_ADDED=1 fi @@ -445,7 +449,7 @@ acct-user_pkg_postinst() { fi elog "Updating user ${ACCT_USER_NAME}" - usermod "${opts[@]}" "${ACCT_USER_NAME}" + nonfatal edo usermod "${opts[@]}" "${ACCT_USER_NAME}" local status=$? if [[ ${status} -eq 8 ]]; then # usermod refused to update the home directory @@ -509,7 +513,7 @@ acct-user_pkg_prerm() { fi elog "Locking user ${ACCT_USER_NAME}" - usermod "${opts[@]}" "${ACCT_USER_NAME}" || die "usermod failed with status $?" + nonfatal edo usermod "${opts[@]}" "${ACCT_USER_NAME}" || die "usermod failed with status $?" } fi