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

[Mike Gilbert]

commit:     e6f14e5d76fff757860691c7aa2f94172018711a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 17:49:06 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 18:57:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f14e5d

acct-user.eclass: include exit status in death message

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

 eclass/acct-group.eclass | 2 +-
 eclass/acct-user.eclass  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass
index 8d2d3adb7221..a0ad86066309 100644
--- a/eclass/acct-group.eclass
+++ b/eclass/acct-group.eclass
@@ -179,7 +179,7 @@ acct-group_pkg_preinst() {
        fi
 
        elog "Adding group ${ACCT_GROUP_NAME}"
-       groupadd "${opts[@]}" "${ACCT_GROUP_NAME}" || die
+       groupadd "${opts[@]}" "${ACCT_GROUP_NAME}" || die "groupadd failed with 
status $?"
 }
 
 fi

diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index b2ac02b2b972..f658aa0eabc3 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -362,7 +362,7 @@ acct-user_pkg_preinst() {
                fi
 
                elog "Adding user ${ACCT_USER_NAME}"
-               useradd "${opts[@]}" "${ACCT_USER_NAME}" || die
+               useradd "${opts[@]}" "${ACCT_USER_NAME}" || die "useradd failed 
with status $?"
                _ACCT_USER_ADDED=1
        fi
 
@@ -454,7 +454,7 @@ acct-user_pkg_postinst() {
                        eerror "  usermod ${optsq[*]} ${ACCT_USER_NAME}"
                else
                        eerror "$(<"${T}/usermod-error.log")"
-                       die "usermod failed"
+                       die "usermod failed with status ${status}"
                fi
        fi
 }
@@ -502,7 +502,7 @@ acct-user_pkg_prerm() {
        fi
 
        elog "Locking user ${ACCT_USER_NAME}"
-       usermod "${opts[@]}" "${ACCT_USER_NAME}" || die
+       usermod "${opts[@]}" "${ACCT_USER_NAME}" || die "usermod failed with 
status $?"
 }
 
 fi