sys-user.eclass: fix killer typo in variable name.

[mjo-overlay.git] / eclass / sys-user.eclass

diff --git a/eclass/sys-user.eclass b/eclass/sys-user.eclass
index 16d77c0ce7c746bcb814dba9a6b50f9c9777ef93..7cfffaf123a2e67e82ed41297c94e3a2c2ea2adf 100644 (file)
--- a/eclass/sys-user.eclass
+++ b/eclass/sys-user.eclass
@@ -252,7 +252,7 @@ sys-user_pkg_preinst() {
                        die "home directory conflict for new user: ${SYS_USER_HOME}"
                fi
 
-               if [[ "${oldhshell}" != "${SYS_USER_SHELL}" ]]; then
+               if [[ "${oldshell}" != "${SYS_USER_SHELL}" ]]; then
                        die "shell conflict for new user: ${SYS_USER_SHELL}"
                fi
 
@@ -269,7 +269,7 @@ sys-user_pkg_prerm() {
        if [[ -z $(sys-user_getuid "${SYS_USER_NAME}") ]]; then
                # We have successfully done nothing.
                ewarn "Tried to remove nonexistent user ${SYS_USER_NAME}."
-       elif [[ -z "${REPLACING_VERSIONS}" ]]; then
+       elif [[ -z "${REPLACED_BY_VERSION}" ]]; then
                # The user to remove exists, and this is not an upgrade. For
                # Phase 1, we maintain the status quo and simply refuse to
                # remove him (unless you know what you are doing).
@@ -282,7 +282,6 @@ sys-user_pkg_prerm() {
                fi
 
                # The missing case: if the user exists and this is an upgrade,
-               # we leave the user alone to be modified in
-               # sys-user_pkg_preinst().
+               # we leave him alone to be modified in sys-user_pkg_preinst().
        fi
 }