Skip to content

Commit

Permalink
Merge pull request #54638 from garethgreenaway/2019_2_1_port_50757
Browse files Browse the repository at this point in the history
[master] Porting #50757 to master
  • Loading branch information
dwoz authored Dec 15, 2019
2 parents 249b52b + 2439752 commit c340ddf
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 c340ddf

Please sign in to comment.