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

only convert to bytes when using Python2

Browse source
This commit is contained in:
Gareth J. Greenaway 2018-05-10 11:46:57 -07:00
parent 0fe32f4066
commit cc1aa75a2f
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/states/archive.py
View file

@ -1262,7 +1262,10 @@ def extracted(name,
if options is None:
try:
with closing(tarfile.open(cached, 'r')) as tar:
tar.extractall(salt.utils.to_bytes(name))
if six.PY2:
tar.extractall(salt.utils.to_bytes(name))
else:
tar.extractall(name)
files = tar.getnames()
if trim_output:
files = files[:trim_output]