saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Special check specifically for bytes types

Browse source
This commit is contained in:
Erik Johnson 2018-04-17 15:34:17 -05:00
parent ee90dd5d95
commit e4182715be
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/file.py
View file

@ -2269,7 +2269,9 @@ def managed(name,
.format(contents_id)
)
if isinstance(use_contents, six.string_types) and str('\0') in use_contents:
if isinstance(use_contents, bytes) and b'\0' in use_contents:
contents = use_contents
elif isinstance(use_contents, six.string_types) and str('\0') in use_contents:
contents = use_contents
else:
validated_contents = _validate_str_list(use_contents)