X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=eclass%2Fsys-user.eclass;h=6fb8f7ab17c96e289d5762ab109c0b5eb0c0c287;hp=56e7bc43bfa3e56407ab8f0d66f77d9d708adfdc;hb=d2e688a09593fb99ba9c189a18494039fb9417f6;hpb=38d15277464dc08b2f7bbb47008400ab7f141a3c

diff --git a/eclass/sys-user.eclass b/eclass/sys-user.eclass
index 56e7bc4..6fb8f7a 100644
--- a/eclass/sys-user.eclass
+++ b/eclass/sys-user.eclass
@@ -16,6 +16,7 @@ EXPORT_FUNCTIONS pkg_pretend src_unpack src_configure src_compile src_install sr
 
 : ${HOMEPAGE:="https://wiki.gentoo.org/wiki/User:Mjo/GLEP:User_packages"}
 : ${DESCRIPTION:="The ${PN} system user"}
+: ${LICENSE="GPL-2"}
 
 # If you want a different username, use a different package name. This
 # prevents different people from claiming the same username.
@@ -131,22 +132,20 @@ sys-user_modify() {
 
 sys-user_pkg_pretend() {
 	# Sanity checks that would otherwise run code in global scope.
-
-	# Next ensure that no other username owns an important UID.
 	if [[ "${SYS_USER_UID_IMPORTANT}" == "true" ]]; then
-		# Ok, the UID is important. Make sure nobody else has it. Or
+
+		# The UID is important, so make sure nobody else has it. Or
 		# rather, nobody else *with a different username* has it.
 		local oldname=$(sys-user_getname "${SYS_USER_UID}")
-		if [[ "${SYS_USER_NAME}" != "${oldname}" ]]; then
+		if [[ -n "${oldname}" ]] && \
+			   [[ "${SYS_USER_NAME}" != "${oldname}" ]]; then
 			die "important UID ${SYS_USER_UID} already belongs to ${oldname}"
 		fi
-	fi
 
-	# Finally, ensure that this username doesn't already exist with
-	# another UID if its UID is supposedly important.
-	local olduid=$(sys-user_getuid "${SYS_USER_NAME}")
-	if [[ -n "${olduid}" ]]; then
-		if [[ "${SYS_USER_UID_IMPORTANT}" == "true" ]] && \
+		# Ensure that this username doesn't already exist with another
+		# UID if its UID is supposedly important.
+		local olduid=$(sys-user_getuid "${SYS_USER_NAME}")
+		if [[ -n "${olduid}" ]] && \
 			   [[ "${SYS_USER_UID}" != "${olduid}" ]]; then
 			# The UID is important and specified, but there is already a
 			# system user with this name and a different UID. Halp.
@@ -270,11 +269,16 @@ sys-user_pkg_prerm() {
 		# We have successfully done nothing.
 		ewarn "Tried to remove nonexistent user ${SYS_USER_NAME}."
 	elif [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# The user to remove exists, and this is not an upgrade, so
-		# we really do remove him.
-		userdel "${SYS_USER_NAME}" || \
-			die "failed to remove user ${SYS_USER_NAME}"
-		einfo "Removed user ${SYS_USER_NAME} from the system."
+		# 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).
+		if [[ "${I_KNOW_WHAT_I_AM_DOING}" == "yes" ]]; then
+			userdel "${SYS_USER_NAME}" || \
+				die "failed to remove user ${SYS_USER_NAME}"
+			einfo "Removed user ${SYS_USER_NAME} from the system."
+		else
+			die "refusing to remove package for system user ${SYS_USER_NAME}"
+		fi
 
 		# The missing case: if the user exists and this is an upgrade,
 		# we leave the user alone to be modified in