Merge lp:~vexo/bzr/fix-1123460 into lp:bzr
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Richard Wilbur | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 6594 | ||||
Proposed branch: | lp:~vexo/bzr/fix-1123460 | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
277 lines (+162/-45) 6 files modified
bzrlib/commit_signature_commands.py (+2/-1) bzrlib/log.py (+1/-1) bzrlib/tests/blackbox/__init__.py (+1/-0) bzrlib/tests/blackbox/test_sign_my_commits.py (+0/-43) bzrlib/tests/blackbox/test_verify_signatures.py (+124/-0) bzrlib/tests/test_log.py (+34/-0) |
||||
To merge this branch: | bzr merge lp:~vexo/bzr/fix-1123460 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Reagan Sanders (community) | Approve | ||
Richard Wilbur | Approve | ||
Review via email: mp+177290@code.launchpad.net |
Commit message
Fix bug LP: #1123460, verify-signature crashes on non ascii characters (and on -v)
Description of the change
Fixes bug LP: #1123460. This bug really wraps up two completely independent issues.
First, the issue with verify-signatures --verbose. We were attempting to pass an array of strings to write() directly. Changed to loop through the array and write them all.
Second, issue with UTF characters in GPG names. We were trying to stick the UTF strings from the GPG subsystem into plain ASCII format strings. Changed the format strings to be UTF as well.
After these fixes, bzr verify-signatures -v and bzr qlog both succeed on a test repository signed with a key containing a UTF-8 name.
vexo@anput:~/sign$ bzr verify-signatures -v
1 commits with valid signatures
ÀÇÐőbˆ Doe <email address hidden> signed 1 commit
0 commits with key now expired
1 commit with unknown key
Unknown key B2C03A8B signed 1 commit
0 commits not valid
0 commits not signed
vexo@anput:~/sign$ bzr qlog
vexo@anput:~/sign$
Additional test example for the all-valid code path:
vexo@anput:~/sign$ bzr verify-signatures -v
All commits signed with verifiable keys
ÀÇÐőbˆ Doe <email address hidden> signed 1 commit
vexo@anput:~/sign$