Skip to content

Commit

Permalink
Merge pull request #50757 from 10ne1/dev/aratiu/restartcheck-fix-pyth…
Browse files Browse the repository at this point in the history
…on3-bytestring

restartcheck: fix python 3 bytestring breakage
  • Loading branch information
dwoz authored Dec 5, 2018
2 parents 1a51bab + 9831191 commit 1e3d0f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion salt/modules/restartcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ def restartcheck(ignorelist=None, blacklist=None, excludepid=None, **kwargs):

while True:
_check_timeout(start_time, timeout)
line = paths.stdout.readline()
line = salt.utils.stringutils.to_unicode(paths.stdout.readline())
if not line:
break
pth = line[:-1]
Expand Down

0 comments on commit 1e3d0f0

Please sign in to comment.