mod_syslog: add newlines for bug #386627
authorZac Medico <zmedico@gentoo.org>
Mon, 10 Oct 2011 14:36:39 +0000 (07:36 -0700)
committerZac Medico <zmedico@gentoo.org>
Mon, 10 Oct 2011 14:36:39 +0000 (07:36 -0700)
This fixes omission of newlines in syslog messages since commit
ca7bef7821876791a26a5f9df6938f4c77fe571f.

pym/portage/elog/mod_syslog.py

index d71dab4f1b1a2da896d386b13990921d5d014a56..79b11a68c1dcdf0265d3da694ce3d8bbdaf3fc87 100644 (file)
@@ -1,5 +1,5 @@
 # elog/mod_syslog.py - elog dispatch module
-# Copyright 2006-2007 Gentoo Foundation
+# Copyright 2006-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import sys
@@ -21,12 +21,11 @@ def process(mysettings, key, logentries, fulltext):
                if not phase in logentries:
                        continue
                for msgtype,msgcontent in logentries[phase]:
-                       msgtext = "".join(msgcontent)
-                       for line in msgtext.splitlines():
+                       for line in msgcontent:
                                line = "%s: %s: %s" % (key, phase, line)
-                               if sys.hexversion < 0x3000000 and isinstance(msgtext, unicode):
+                               if sys.hexversion < 0x3000000 and isinstance(line, unicode):
                                        # Avoid TypeError from syslog.syslog()
                                        line = line.encode(_encodings['content'], 
                                                'backslashreplace')
-                               syslog.syslog(_pri[msgtype], line)
+                               syslog.syslog(_pri[msgtype], line.rstrip("\n"))
        syslog.closelog()