1 |
Author: ulm |
2 |
Date: 2009-04-16 14:42:37 +0000 (Thu, 16 Apr 2009) |
3 |
New Revision: 436 |
4 |
|
5 |
Modified: |
6 |
branches/branch-1.0.x/ChangeLog |
7 |
branches/branch-1.0.x/libs/config.bash.in |
8 |
Log: |
9 |
Backport r434 from trunk. |
10 |
|
11 |
Modified: branches/branch-1.0.x/ChangeLog |
12 |
=================================================================== |
13 |
--- branches/branch-1.0.x/ChangeLog 2009-04-16 14:39:20 UTC (rev 435) |
14 |
+++ branches/branch-1.0.x/ChangeLog 2009-04-16 14:42:37 UTC (rev 436) |
15 |
@@ -3,13 +3,16 @@ |
16 |
* configure.ac: Update version to 1.0.12. |
17 |
* NEWS: Add news for pending release. |
18 |
|
19 |
+ * libs/config.bash.in (store_config): Split config file content |
20 |
+ on newlines only, not on all whitespace. Fixes bug 219864. |
21 |
+ |
22 |
* misc/eselect.bashcomp (_eselect): Suppress 'Killed' message. |
23 |
Don't match regexps on escape sequences. Fixes bug 218557. |
24 |
|
25 |
* libs/core.bash.in (die): Suppress error messages from pgrep |
26 |
and kill, bugs 174354 and 264734. |
27 |
|
28 |
- + Backport: r429, r431 (trunk/) |
29 |
+ + Backport: r429, r431, r434 (trunk/) |
30 |
|
31 |
2009-04-15 Ulrich Mueller <ulm@g.o> |
32 |
|
33 |
|
34 |
Modified: branches/branch-1.0.x/libs/config.bash.in |
35 |
=================================================================== |
36 |
--- branches/branch-1.0.x/libs/config.bash.in 2009-04-16 14:39:20 UTC (rev 435) |
37 |
+++ branches/branch-1.0.x/libs/config.bash.in 2009-04-16 14:42:37 UTC (rev 436) |
38 |
@@ -56,12 +56,14 @@ |
39 |
|
40 |
( |
41 |
# parse the names of all settings in the file |
42 |
+ IFS=$'\n' |
43 |
for line in ${content[@]} ; do |
44 |
[[ ${line/=/} != ${line} ]] || continue |
45 |
line=${line/=*/} |
46 |
local ${line}="" |
47 |
vars=(${vars[@]} ${line}) |
48 |
done |
49 |
+ unset IFS |
50 |
|
51 |
source ${configfile} 2>&1 > /dev/null \ |
52 |
|| die "Failed to source ${configfile}." |