X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=eclass%2Fsys-user.eclass;h=7cfffaf123a2e67e82ed41297c94e3a2c2ea2adf;hp=16d77c0ce7c746bcb814dba9a6b50f9c9777ef93;hb=49a2493f92d112d98b9a8484eb453aa0167396eb;hpb=d71777cf39b77bb7760abc8a7c5725111e293741

diff --git a/eclass/sys-user.eclass b/eclass/sys-user.eclass
index 16d77c0..7cfffaf 100644
--- 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
 }