cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bugfix: use to_text(stdout) in psrp.Connection.put_file method (#73491)

Browse source 
Co-authored-by: jakegatsby <jakegatsby@example.com>
This commit is contained in:
jakegatsby 2021-02-04 19:01:07 -05:00 committed by GitHub
parent 0cdc410dce
commit f271d02a9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/psrp-json-loads-bytes.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- to_text(stdout) before json.loads in psrp.Connection.put_file in case stdout is bytes

2
lib/ansible/plugins/connection/psrp.py
View file

@ -472,7 +472,7 @@ class Connection(ConnectionBase):
if rc != 0: if rc != 0:
raise AnsibleError(to_native(stderr)) raise AnsibleError(to_native(stderr))
put_output = json.loads(stdout) put_output = json.loads(to_text(stdout))
remote_sha1 = put_output.get("sha1") remote_sha1 = put_output.get("sha1")
if not remote_sha1: if not remote_sha1: