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

Merge pull request #49446 from rallytime/bp-49356

Browse source 
Back-port #49356 to 2018.3.3
This commit is contained in:
Nicole Thomas 2018-08-30 14:04:00 -04:00 • committed by GitHub
commit d6ddcab351
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/utils/timed_subprocess.py
View file

@ -40,7 +40,7 @@ class TimedProc(object):
if self.timeout and not isinstance(self.timeout, (int, float)):
raise salt.exceptions.TimedProcTimeoutError('Error: timeout {0} must be a number'.format(self.timeout))
if kwargs.get('shell', False):
if six.PY2 and kwargs.get('shell', False):
args = salt.utils.stringutils.to_bytes(args)
try: