[gentoo-commits] proj/emacs-tools:eselect-emacs-1.1 commit in: /

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     0cfc840128ce934df925a71e246b4c033ed6c303
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 13:19:45 2007 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 13:19:45 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0cfc8401

Workaround for bug #172472.

svn path=/emacs-extra/eselect-emacs/; revision=382

---
 emacs.eselect     |    2 +-
 env-emacs.eselect |   36 +++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/emacs.eselect b/emacs.eselect
index 5bb00c8..0b0a9a4 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -118,7 +118,7 @@ set_symlinks() {
 	set_infopath "${target}"
 
 	# update /etc/profile.env from /etc/env.d files
-	#do_action env-emacs update --no-ldconfig >/dev/null
+	#do_action env-emacs update --no-ldconfig
 	env-update --no-ldconfig
 
 	return 0

diff --git a/env-emacs.eselect b/env-emacs.eselect
index a441941..c791ca3 100644
--- a/env-emacs.eselect
+++ b/env-emacs.eselect
@@ -40,6 +40,13 @@ LDMTIMEDB="${ROOT}/var/lib/eselect/env/ld-mtimedb"
 # Keep all stored LDPATHS
 ESELECT_LDPATH=( )
 
+# workaround for bug #172472
+load_config_ () {
+	[[ ${#@} -eq 2 ]] || die
+	local ${2}
+	load_config ${@}
+}
+
 # is_envd_file()
 # Return successfuly when file can be sourced.
 is_envfile() {
@@ -69,13 +76,13 @@ update_envvar_classes() {
 	for envfile in ${envfiles[@]} ; do
 		is_envfile ${envfile} || continue
 
-		value=$(load_config ${envfile} COLON_SEPARATED)
+		value=$(load_config_ ${envfile} COLON_SEPARATED)
 		for x in ${value} ; do
 			has ${x} ${PATH_CLASS} && continue
 			PATH_CLASS="${PATH_CLASS} ${x}"
 		done
 
-		value=$(load_config ${envfile} SPACE_SEPARATED)
+		value=$(load_config_ ${envfile} SPACE_SEPARATED)
 		for x in ${value} ; do
 			has ${x} ${SPACE_CLASS} && continue
 			SPACE_CLASS="${SPACE_CLASS} ${x}"
@@ -107,15 +114,14 @@ create_profile_env() {
 			-e '/^#/d' -e '/^\s*$/d' -e '/^.*=/s/^\([^=]*\)=.*/\1/' \
 			${envfile})
 		[[ -z ${vars} ]] && continue
-		local ${vars}			# workaround for bug #172472
 		for var in ${vars} ; do
 			# Colon separated?...
 			if has ${var} ${PATH_CLASS} ; then
-				store=$(load_config ${tmpprofile} ${var})
+				store=$(load_config_ ${tmpprofile} ${var})
 				if [[ -z ${store} ]] ; then
-					store=$(load_config ${envfile} ${var})
+					store=$(load_config_ ${envfile} ${var})
 				else
-					items="$(load_config ${envfile} ${var})"
+					items="$(load_config_ ${envfile} ${var})"
 					items=( ${items//:/ } )
 					for item in ${items[@]} ; do
 						has ${item} ${store//:/ } && continue
@@ -127,11 +133,11 @@ create_profile_env() {
 			fi
 			# Space separated!...
 			if has ${var} ${SPACE_CLASS} ; then
-				store=( $(load_config ${tmpprofile} ${var}) )
+				store=( $(load_config_ ${tmpprofile} ${var}) )
 				if [[ -z ${store[@]} ]] ; then
-					store=( $(load_config ${envfile} ${var}) )
+					store=( $(load_config_ ${envfile} ${var}) )
 				else
-					items=( $(load_config ${envfile} ${var}) )
+					items=( $(load_config_ ${envfile} ${var}) )
 					for item in ${items[@]} ; do
 						has ${item} ${store[@]} && continue
 						store=( ${store[@]} ${item} )
@@ -144,12 +150,12 @@ create_profile_env() {
 			store_config \
 				${tmpprofile} \
 				${var} \
-				"$(load_config ${envfile} ${var})"
+				"$(load_config_ ${envfile} ${var})"
 		done
 	
 		has LDPATH ${vars} || continue
 		# Store LDPATH for later processing
-		items=$(load_config ${envfile} LDPATH)
+		items=$(load_config_ ${envfile} LDPATH)
 		items=( ${items//:/ } )
 		for item in ${items[@]} ; do
 			has ${item} ${LDPATH[@]} && continue 
@@ -194,10 +200,10 @@ create_prelink_conf() {
 		[[ -e ${ROOT}/${x} ]] && str="${str}-l /${x}\n"
 		[[ -e ${ROOT}/usr/${x} ]] && str="${str}-l /usr/${x}\n"
 	done
-	prelink_mask=$(load_config ${ENVPROFILE} PRELINK_PATH_MASK)
+	prelink_mask=$(load_config_ ${ENVPROFILE} PRELINK_PATH_MASK)
 	prelink_mask=( ${prelink_mask//:/ } )
-	prelink="$(load_config ${ENVPROFILE} PATH)"
-	prelink="${prelink} $(load_config ${ENVPROFILE} PRELINK_PATH)"
+	prelink="$(load_config_ ${ENVPROFILE} PATH)"
+	prelink="${prelink} $(load_config_ ${ENVPROFILE} PRELINK_PATH)"
 	prelink=( ${prelink//:/ } ${ESELECT_LDPATH[@]} )
 	for x in ${prelink[@]} ; do
 		has ${x} ${prelink_mask} && continue
@@ -219,7 +225,7 @@ need_links() {
 		y=${y//-/_}
 		y=${y//./_}
 		y=${y//+/_}
-		oldmtime=$(load_config ${LDMTIMEDB} "mtime${y}")
+		oldmtime=$(load_config_ ${LDMTIMEDB} "mtime${y}")
 		newmtime=$(stat -c %Y ${x} 2> /dev/null)
 		if [[ ${oldmtime} != ${newmtime} ]] ; then
 			ret=0