[master 3/3] makePickle now needs to return bytes

bcl installerbot-noreply at redhat.com
Wed Jul 29 23:05:50 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

It gets fed through socket.sendall which can no longer handle strings.
---
 pyanaconda/anaconda_log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py
index 4008844..e494c14 100644
--- a/pyanaconda/anaconda_log.py
+++ b/pyanaconda/anaconda_log.py
@@ -87,7 +87,7 @@ def mapPriority(self, level):
 
 class AnacondaSocketHandler(SocketHandler):
     def makePickle(self, record):
-        return self.formatter.format(record) + "\n"
+        return bytes(self.formatter.format(record) + "\n", "utf-8")
 
 class AnacondaLog:
     SYSLOG_CFGFILE = "/etc/rsyslog.conf"


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/b6cd332b764ab62375a33b4ee14f0a215a6b87bb


More information about the anaconda-patches mailing list