valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

salt.states.reg.present: Prevent traceback when reg data is binary

Browse Source 
This prevents a failed decode of undecodable data from resulting in a
traceback by catching the exception and just using the original value in
the changes dict.
This commit is contained in:
Erik Johnson 2018-02-12 22:47:59 -06:00
parent 7779fea7ba
commit 8cf13325ee
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/states/reg.py
View File

@ -192,9 +192,14 @@ def present(name,
salt.utils.to_unicode(name, 'utf-8'))
return ret
try:
vdata_decoded = salt.utils.to_unicode(vdata, 'utf-8')
except UnicodeDecodeError:
# vdata contains binary data that can't be decoded
vdata_decoded = vdata
add_change = {'Key': r'{0}\{1}'.format(hive, key),
'Entry': u'{0}'.format(salt.utils.to_unicode(vname, 'utf-8') if vname else u'(Default)'),
'Value': salt.utils.to_unicode(vdata, 'utf-8')}
'Value': vdata_decoded}
# Check for test option
if __opts__['test']: