mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 22:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Properly decode installer error output before storing it with installer stdout, so that later if we have to display/print it we don't trigger an exception if we have both stdout and stderr captured.

Browse Source
This commit is contained in:
Greg Neagle
2020-05-04 13:43:12 -07:00
parent 6dff4db5d8
commit 46cf0d05f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/client/munkilib/installer/pkg.py
View File

@@ -198,12 +198,12 @@ def _run_installer(cmd, env_vars, packagename):
retcode = job.returncode()
if retcode != 0:
# append stdout to our installer output
installeroutput.extend(job.stderr.read().splitlines())
installeroutput.extend(job.stderr.read().decode("UTF-8").splitlines())
display.display_status_minor(
"Install of %s failed with return code %s" % (packagename, retcode))
display.display_error("-"*78)
for line in installeroutput:
display.display_error(line.decode("UTF-8").rstrip("\n"))
display.display_error(line.rstrip("\n"))
display.display_error("-"*78)
elif retcode == 0:
munkilog.log("Install of %s was successful." % packagename)