From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RU1Ys-0008Hp-IB for garchives@archives.gentoo.org; Fri, 25 Nov 2011 19:35:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABEFC21C038; Fri, 25 Nov 2011 19:35:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 76F5621C038 for ; Fri, 25 Nov 2011 19:35:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBEAD1B4027 for ; Fri, 25 Nov 2011 19:35:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6158E80042 for ; Fri, 25 Nov 2011 19:35:41 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <9e6364fe049b5cc59e8cb54f683bbd11d45a7504.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/elog/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/elog/mod_syslog.py X-VCS-Directories: pym/portage/elog/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9e6364fe049b5cc59e8cb54f683bbd11d45a7504 Date: Fri, 25 Nov 2011 19:35:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a89372a7-4b40-45ce-8f70-f0f5af68cae4 X-Archives-Hash: 98bf660b1c39a6387530cab32ec8aac3 commit: 9e6364fe049b5cc59e8cb54f683bbd11d45a7504 Author: Zac Medico gentoo org> AuthorDate: Fri Nov 25 19:35:32 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Nov 25 19:35:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9e6364fe elog/mod_syslog: fix 1 char msgs, bug #390965 --- pym/portage/elog/mod_syslog.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/pym/portage/elog/mod_syslog.py b/pym/portage/elog/mod_syslog= .py index 6455841..c8bf441 100644 --- a/pym/portage/elog/mod_syslog.py +++ b/pym/portage/elog/mod_syslog.py @@ -7,6 +7,9 @@ import syslog from portage.const import EBUILD_PHASES from portage import _encodings =20 +if sys.hexversion >=3D 0x3000000: + basestring =3D str + _pri =3D { "INFO" : syslog.LOG_INFO,=20 "WARN" : syslog.LOG_WARNING,=20 @@ -21,6 +24,8 @@ def process(mysettings, key, logentries, fulltext): if not phase in logentries: continue for msgtype,msgcontent in logentries[phase]: + if isinstance(msgcontent, basestring): + msgcontent =3D [msgcontent] for line in msgcontent: line =3D "%s: %s: %s" % (key, phase, line) if sys.hexversion < 0x3000000 and not isinstance(line, bytes):