Merge lp:~vila/bzr/1249732-acceptable-keys-from-config into lp:bzr
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Richard Wilbur |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6595 |
Proposed branch: | lp:~vila/bzr/1249732-acceptable-keys-from-config |
Merge into: | lp:bzr |
Diff against target: |
89 lines (+19/-16) 4 files modified
bzrlib/commit_signature_commands.py (+3/-3) bzrlib/gpg.py (+4/-13) bzrlib/tests/test_gpg.py (+9/-0) doc/en/release-notes/bzr-2.7.txt (+3/-0) |
To merge this branch: | bzr merge lp:~vila/bzr/1249732-acceptable-keys-from-config |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Richard Wilbur | Approve | ||
Bazaar Codereview Subscribers | Pending | ||
Review via email: mp+194640@code.launchpad.net |
Commit message
Fix command line override handling for acceptable_keys
Description of the change
The root cause is that some code was providing support to a command-line
override for a config option (and mixed with converting a string value to a
list object).
This was missed when the 'acceptable_keys' was migrated to the new config
stacks which provide both features.
So basically a missing test for gpg didn't track the regression.
Test added, code simplified, bug gone ;)
To post a comment you must log in.
Good fix! Looks like gpg now is happy to deal with Unicode?
+1