Merge lp:~bialix/bzr/2.2-configobj into lp:bzr/2.2
Proposed by
Alexander Belchenko
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merge reported by: | Alexander Belchenko |
Merged at revision: | not available |
Proposed branch: | lp:~bialix/bzr/2.2-configobj |
Merge into: | lp:bzr/2.2 |
Diff against target: |
74 lines (+35/-3) 3 files modified
NEWS (+4/-0) bzrlib/tests/test_config.py (+27/-1) bzrlib/util/configobj/configobj.py (+4/-2) |
To merge this branch: | bzr merge lp:~bialix/bzr/2.2-configobj |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Vincent Ladeuil | Approve | ||
Martin Pool | Approve | ||
Review via email: mp+50507@code.launchpad.net |
Commit message
Ensure config options containing triple quotes won't corrupt config files.
Description of the change
Fixed bug in the bundled copy of ConfigObj with quoting of triple quotes
in the value string. Fix suggested by ConfigObj's author Michael Foord.
This patch provides the fix to 2.2 series, should I provide the similar patches for 2.3 and bzr.dev, or it will be merged to other series by some integration process?
To post a comment you must log in.
It looks like there's some concern in that bug, but to me this seems reasonable and uncontroversial. Am I missing something? Otherwise, approved. Thanks.