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

Merge pull request #46116 from rallytime/utils-paths

Browse Source 
Update stringutils path in reg state to use new location
This commit is contained in:
Nicole Thomas 2018-02-21 10:05:43 -05:00 committed by GitHub
commit 1f31031adc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/reg.py
View File

@ -193,7 +193,7 @@ def present(name,
return ret
try:
vdata_decoded = salt.utils.to_unicode(vdata, 'utf-8')
vdata_decoded = salt.utils.stringutils.to_unicode(vdata, 'utf-8')
except UnicodeDecodeError:
# vdata contains binary data that can't be decoded
vdata_decoded = vdata