2005-09-04 Danny van Dyk <kugelfang@gentoo.org>

        * modules/blas.eselect: Fixed a bug about setting implementation to
        reference in case we had an active C implementation already. Storing
        configuration will now be handled after the setup_*() step.
        * modules/lapack.eselect: Storing configuration will now be handled
        after the setup_*() step.

diffstat:
 blas.eselect   |   11 ++++++++---
 lapack.eselect |    7 ++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

svn path=/trunk/; revision=180

4 files changed, 26 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 95a4dd4..6a28bdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 ChangeLog for eselect
 
+2005-09-04 Danny van Dyk <kugelfang@gentoo.org>
+
+	* modules/blas.eselect: Fixed a bug about setting implementation to
+	reference in case we had an active C implementation already. Storing
+	configuration will now be handled after the setup_*() step.
+	* modules/lapack.eselect: Storing configuration will now be handled
+	after the setup_*() step.
+
 2005-08-31 Danny van Dyk <kugelfang@gentoo.org>
 
 	* modules/kernel.eselect: Fixed bug #104354. kernel.eselect now looks
diff --git a/TODO b/TODO
index ef313f4..c3aabfb 100644
--- a/TODO
+++ b/TODO
@@ -8,13 +8,16 @@ Targets for 1.0.0
 * inherit / import functionality -- we could use some way of having a set of
   common actions for, for example, alternatives-style plugins. Probably just a
   wrapper around source and a few variables. Should be dead easy to do once we
-  figure out interface details. (ciaranm)
+  figure out interface details. (all)
+
+Targets for 1.1.0
+=================
 
 * figure out interactive mode -- interactive should only be allowed for
   certain designated actions. We'll also need library functions for menus and
-  so on. See code in config module for a rough demo. (ciaranm)
+  so on. See code in config module for a rough demo. (n.n)
 
-* make these modules 'undodgy': binutils,config (all)
+* make these modules 'undodgy': config (n.n)
 
 Possible Ideas
 ==============
diff --git a/modules/blas.eselect b/modules/blas.eselect
index 31dccfa..1859a1d 100644
--- a/modules/blas.eselect
+++ b/modules/blas.eselect
@@ -153,6 +153,8 @@ setup_reference() {
 		ln -sf ${1}/blas/reference/libblas.so ${1}/libblas.so
 		ln -sf ${1}/blas/reference/libblas.so ${1}/libblas.so.0
 		ln -sf ${1}/blas/reference/libblas.a  ${1}/libblas.a
+	elif [[ ${2} == C ]] ; then
+		return 1
 	else
 		die "Illegal profile: ${2}"
 	fi
@@ -237,13 +239,16 @@ do_set() {
 	write_list_start "Changing BLAS implementation to $(highlight ${impl}) in"
 	echo "  ${libdirs}"
 	write_list_start "Affected language interfaces"
-	echo "  ${profiles}"
 	for libdir in ${libdirs} ; do
 		for prof in ${profiles} ; do
-			setup_${impl} ${ROOT}/usr/${libdir} ${prof}
-			store_config ${BLAS_CONFIG} "${prof}_${libdir}_CURRENT" ${impl}
+			if setup_${impl} ${ROOT}/usr/${libdir} ${prof} ; then
+				has ${prof} ${myprofiles} \
+					|| myprofiles=( ${myprofiles[@]} ${prof} )
+				store_config ${BLAS_CONFIG} "${prof}_${libdir}_CURRENT" ${impl}
+			fi
 		done
 	done
+	echo "  ${myprofiles[@]}"
 }
 
 ### show action ###
diff --git a/modules/lapack.eselect b/modules/lapack.eselect
index a029fe3..07743bf 100644
--- a/modules/lapack.eselect
+++ b/modules/lapack.eselect
@@ -165,9 +165,10 @@ do_set() {
 	echo "  ${profiles}"
 	for libdir in ${libdirs} ; do
 		for prof in ${profiles} ; do
-			setup_${impl} ${ROOT}/usr/${libdir} ${prof}
-			store_config ${LAPACK_CONFIG} \
-				"${prof}_${libdir}_CURRENT" ${impl}
+			setup_${impl} ${ROOT}/usr/${libdir} ${prof} \
+				&& store_config ${LAPACK_CONFIG} \
+					"${prof}_${libdir}_CURRENT" ${impl} \
+				|| die "Please report this incident!"
 		done
 	done
 }