1 |
Author: ulm |
2 |
Date: 2009-04-16 14:38:28 +0000 (Thu, 16 Apr 2009) |
3 |
New Revision: 434 |
4 |
|
5 |
Modified: |
6 |
trunk/ChangeLog |
7 |
trunk/libs/config.bash.in |
8 |
Log: |
9 |
Split config file content on newlines only. Fixes bug 219864. |
10 |
|
11 |
Modified: trunk/ChangeLog |
12 |
=================================================================== |
13 |
--- trunk/ChangeLog 2009-04-16 09:24:02 UTC (rev 433) |
14 |
+++ trunk/ChangeLog 2009-04-16 14:38:28 UTC (rev 434) |
15 |
@@ -1,5 +1,8 @@ |
16 |
2009-04-16 Ulrich Mueller <ulm@g.o> |
17 |
|
18 |
+ * libs/config.bash.in (store_config): Split config file content |
19 |
+ on newlines only, not on all whitespace. Fixes bug 219864. |
20 |
+ |
21 |
* misc/eselect.bashcomp (_eselect): Suppress 'Killed' message. |
22 |
Don't match regexps on escape sequences. Fixes bug 218557. |
23 |
|
24 |
|
25 |
Modified: trunk/libs/config.bash.in |
26 |
=================================================================== |
27 |
--- trunk/libs/config.bash.in 2009-04-16 09:24:02 UTC (rev 433) |
28 |
+++ trunk/libs/config.bash.in 2009-04-16 14:38:28 UTC (rev 434) |
29 |
@@ -56,12 +56,14 @@ |
30 |
|
31 |
( |
32 |
# parse the names of all settings in the file |
33 |
+ IFS=$'\n' |
34 |
for line in ${content[@]} ; do |
35 |
[[ ${line/=/} != ${line} ]] || continue |
36 |
line=${line/=*/} |
37 |
local ${line}="" |
38 |
vars=(${vars[@]} ${line}) |
39 |
done |
40 |
+ unset IFS |
41 |
|
42 |
source ${configfile} 2>&1 > /dev/null \ |
43 |
|| die "Failed to source ${configfile}." |