Merge lp:~mandel/ubuntu-sso-client/fix_no_creds_windows into lp:ubuntu-sso-client
Proposed by
Manuel de la Peña
Status: | Merged |
---|---|
Approved by: | Manuel de la Peña |
Approved revision: | 694 |
Merged at revision: | 694 |
Proposed branch: | lp:~mandel/ubuntu-sso-client/fix_no_creds_windows |
Merge into: | lp:ubuntu-sso-client |
Diff against target: |
43 lines (+13/-2) 2 files modified
ubuntu_sso/keyring/tests/test_windows.py (+11/-1) ubuntu_sso/keyring/windows.py (+2/-1) |
To merge this branch: | bzr merge lp:~mandel/ubuntu-sso-client/fix_no_creds_windows |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Casteleijn (community) | Approve | ||
Shane Fagan (community) | Approve | ||
Review via email: mp+55651@code.launchpad.net |
Commit message
Fixes lp:746096 the bug by ensuring that we do not try to load a json object from None.
Description of the change
Fixes lp:746096 the bug by ensuring that we do not try to load a json object from None.
To post a comment you must log in.
tested on windows trivial enough