Merge lp:~roadmr/checkbox/fix-gconf-resource into lp:checkbox
Proposed by
Daniel Manrique
Status: | Merged |
---|---|
Merged at revision: | 1533 |
Proposed branch: | lp:~roadmr/checkbox/fix-gconf-resource |
Merge into: | lp:checkbox |
Diff against target: |
66 lines (+10/-7) 2 files modified
debian/changelog (+3/-1) scripts/gconf_resource (+7/-6) |
To merge this branch: | bzr merge lp:~roadmr/checkbox/fix-gconf-resource |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marc Tardif (community) | Approve | ||
Review via email: mp+116664@code.launchpad.net |
Description of the change
Fixes the attached bug by changing the decoding charset.
I moved a bit of code around to factor command execution out of the get_gconf function, mainly to ease testing. I didn't find a way or place to put a proper test of the function :( Suggestions welcome, but the code seems to work now. To test it, download the gconf.txt file from the bug (comment #3), and replace COMMAND with something like "cat gconf.txt". Change the encoding from ascii to utf-8 and viceversa to see things pass/fail.
To post a comment you must log in.
Hm, I remember specifically setting the encoding to ascii but I was probably only thinking about the keys. I now see that the values can conceivably be encoded in utf-8!
The changes look good but I made a couple modifications while merging:
1. The parentheses around the check_output were not necessary for the arguments to be split on multiple lines.
2. The length of the command and its arguments was short, so they didn't really need to be split in the first place :)