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

[Reinis Danne]

commit:     298f52cea3b60e05a2b851e2ebd745d45045684c
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 17:02:36 2014 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Tue Jan 21 17:02:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=298f52ce

fixed a bit removing alternative module with newer eselect

---
 eclass/alternatives-2.eclass | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
index 38a0328..fe2f55e 100644
--- a/eclass/alternatives-2.eclass
+++ b/eclass/alternatives-2.eclass
@@ -147,13 +147,18 @@ alternatives-2_pkg_prerm() {
 		#echo "Making sure ${alt} has a valid provider"
 		#echo eselect "${alt}" update${ignore} "${provider}"
 		eselect "${alt}" update${ignore} "${provider}" && continue
-		einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
-		if [[ $? -eq 2 ]]; then
-			einfo "Cleaning up unused alternatives module for ${alt}"
-			echo rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect"
-			rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" ||
-				eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed
-		fi
+		einfo "Removing ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
+		case $? in
+			0) : ;;
+			2)
+				einfo "Cleaning up unused alternatives module for ${alt}"
+				rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" || \
+					eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed
+				;;
+			*)
+				eerror eselect "${alt}" update "${provider}" returned $?
+				;;
+		esac
 	done
 }