[gentoo-commits] proj/sci:master commit in: eclass/

[Reinis Danne]

commit:     89fc5b43baf07787a4ad7f66606c2f5c95a641e9
Author:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Tue Jan 21 16:29:57 2014 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Tue Jan 21 20:05:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=89fc5b43

alternatives-2.eclass: Fix check for uninstalling

---
 eclass/alternatives-2.eclass | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
index a6c2ef6..217ba4d 100644
--- a/eclass/alternatives-2.eclass
+++ b/eclass/alternatives-2.eclass
@@ -200,17 +200,21 @@ alternatives-2_pkg_postinst() {
 #
 # Provided alternatives are set up using alternatives_for().
 alternatives-2_pkg_prerm() {
-	local a alt provider ignore
+	local a alt provider ignore ret
 	local EAUTO="${EROOT%/}/usr/share/eselect/modules/auto"
-	[[ -n ${REPLACED_BY_ID} ]] || ignore=" --ignore"
+	# If we are uninstalling, update alternatives to valid provider
+	[[ -n ${REPLACED_BY_VERSION} ]] || ignore="--ignore"
 	for a in "${ALTERNATIVES_PROVIDED[@]}"; do
 		alt="${a%:*}"
 		provider="${a#*:}"
-		eselect "${alt}" update${ignore} "${provider}" && continue
-		einfo "Removing ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
-		case $? in
+		eselect "${alt}" update ${ignore} "${provider}"
+		ret=$?
+		[[ -n ${REPLACED_BY_VERSION} ]] || \
+			einfo "Removing ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
+		case ${ret} in
 			0) : ;;
 			2)
+				# This was last provider for the alternative, remove eselect module
 				einfo "Cleaning up unused alternatives module for ${alt}"
 				rm "${EAUTO}/${alt}.eselect" || \
 					eerror "rm ${EAUTO}/${alt}.eselect failed"