| 1 |
Author: ulm |
| 2 |
Date: 2009-12-28 22:13:42 +0000 (Mon, 28 Dec 2009) |
| 3 |
New Revision: 743 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/NEWS |
| 8 |
trunk/modules/env.eselect |
| 9 |
Log: |
| 10 |
Exclude LDPATH from profile.env, fixes bug 298789. |
| 11 |
|
| 12 |
Modified: trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/ChangeLog 2009-12-26 22:07:19 UTC (rev 742) |
| 15 |
+++ trunk/ChangeLog 2009-12-28 22:13:42 UTC (rev 743) |
| 16 |
@@ -1,3 +1,8 @@ |
| 17 |
+2009-12-28 Ulrich Mueller <ulm@g.o> |
| 18 |
+ |
| 19 |
+ * modules/env.eselect (create_profile_env): Exclude LDPATH from |
| 20 |
+ profile.env, fixes bug 298789. |
| 21 |
+ |
| 22 |
2009-12-04 Ulrich Mueller <ulm@g.o> |
| 23 |
|
| 24 |
* Makefile.am (MAINTAINERCLEANFILES): Remove config dir, since |
| 25 |
|
| 26 |
Modified: trunk/NEWS |
| 27 |
=================================================================== |
| 28 |
--- trunk/NEWS 2009-12-26 22:07:19 UTC (rev 742) |
| 29 |
+++ trunk/NEWS 2009-12-28 22:13:42 UTC (rev 743) |
| 30 |
@@ -1,6 +1,10 @@ |
| 31 |
This file contains a summary of changes in released versions. Please read the |
| 32 |
ChangeLog file for a more detailed listing of changes/bug fixes. |
| 33 |
|
| 34 |
+trunk: |
| 35 |
+ Bug fixes: |
| 36 |
+ - Fixed bug #298789: Exclude LDPATH from profile.env in env module. |
| 37 |
+ |
| 38 |
1.2.8: |
| 39 |
Bug fixes: |
| 40 |
- Fixed bug #293317: Use EPREFIX in skel library when called from ebuild. |
| 41 |
|
| 42 |
Modified: trunk/modules/env.eselect |
| 43 |
=================================================================== |
| 44 |
--- trunk/modules/env.eselect 2009-12-26 22:07:19 UTC (rev 742) |
| 45 |
+++ trunk/modules/env.eselect 2009-12-28 22:13:42 UTC (rev 743) |
| 46 |
@@ -112,8 +112,11 @@ |
| 47 |
${envfile}) |
| 48 |
[[ -z ${vars} ]] && continue |
| 49 |
for var in ${vars} ; do |
| 50 |
- # Colon separated?... |
| 51 |
- if has ${var} ${PATH_CLASS} ; then |
| 52 |
+ if [[ ${var} = LDPATH ]]; then |
| 53 |
+ # Don't store LDPATH in profile.env |
| 54 |
+ : |
| 55 |
+ elif has ${var} ${PATH_CLASS}; then |
| 56 |
+ # Colon separated |
| 57 |
store=$(load_config ${tmpprofile} ${var}) |
| 58 |
if [[ -z ${store} ]] ; then |
| 59 |
store=$(load_config ${envfile} ${var}) |
| 60 |
@@ -126,10 +129,8 @@ |
| 61 |
done |
| 62 |
fi |
| 63 |
store_config ${tmpprofile} ${var} "${store#:}" |
| 64 |
- continue |
| 65 |
- fi |
| 66 |
- # Space separated!... |
| 67 |
- if has ${var} ${SPACE_CLASS} ; then |
| 68 |
+ elif has ${var} ${SPACE_CLASS}; then |
| 69 |
+ # Space separated |
| 70 |
store=( $(load_config ${tmpprofile} ${var}) ) |
| 71 |
if [[ -z ${store[@]} ]] ; then |
| 72 |
store=( $(load_config ${envfile} ${var}) ) |
| 73 |
@@ -141,13 +142,11 @@ |
| 74 |
done |
| 75 |
fi |
| 76 |
store_config ${tmpprofile} ${var} "${store[@]}" |
| 77 |
- continue |
| 78 |
+ else |
| 79 |
+ # Ok, just a non-cumulative var. |
| 80 |
+ store_config ${tmpprofile} ${var} \ |
| 81 |
+ "$(load_config ${envfile} ${var})" |
| 82 |
fi |
| 83 |
- # Ok, just a non-cummultative var. |
| 84 |
- store_config \ |
| 85 |
- ${tmpprofile} \ |
| 86 |
- ${var} \ |
| 87 |
- "$(load_config ${envfile} ${var})" |
| 88 |
done |
| 89 |
|
| 90 |
has LDPATH ${vars} || continue |
Archives