From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8DEE9198005 for ; Wed, 13 Mar 2013 15:19:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71638E0466; Wed, 13 Mar 2013 15:19:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 063AAE0466 for ; Wed, 13 Mar 2013 15:19:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16A5533BEC8 for ; Wed, 13 Mar 2013 15:19:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1C1AFE4079 for ; Wed, 13 Mar 2013 15:19:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1363187946.ca966f66b92a928c4296e5f0f5bca3c18d83e324.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ca966f66b92a928c4296e5f0f5bca3c18d83e324 X-VCS-Branch: master Date: Wed, 13 Mar 2013 15:19:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 99785485-37ad-4315-9cba-682fd072e962 X-Archives-Hash: b7686655c1751e59085ce1c6d4e3276b commit: ca966f66b92a928c4296e5f0f5bca3c18d83e324 Author: Zac Medico gentoo org> AuthorDate: Wed Mar 13 15:19:06 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 13 15:19:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca966f66 Use writemsg for unicode safety in set messages. --- pym/_emerge/actions.py | 13 ++++++++----- pym/_emerge/depgraph.py | 8 +++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 008a5d5..2c5a1b3 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -3429,15 +3429,18 @@ def expand_set_arguments(myfiles, myaction, root_config): return (None, 1) if myaction in unmerge_actions and \ not sets[s].supportsOperation("unmerge"): - sys.stderr.write("emerge: the given set '%s' does " % s + \ - "not support unmerge operations\n") + writemsg_level("emerge: the given set '%s' does " % s + \ + "not support unmerge operations\n", + level=logging.ERROR, noiselevel=-1) retval = 1 elif not set_atoms: - print("emerge: '%s' is an empty set" % s) + writemsg_level("emerge: '%s' is an empty set\n" % s, + level=logging.INFO, noiselevel=-1) else: newargs.extend(set_atoms) - for e in sets[s].errors: - print(e) + for error_msg in sets[s].errors: + writemsg_level("%s\n" % (error_msg,), + level=logging.ERROR, noiselevel=-1) else: newargs.append(a) return (newargs, retval) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index dfef6a7..326dd68 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2742,7 +2742,8 @@ class depgraph(object): noiselevel=-1) for pset in list(depgraph_sets.sets.values()) + [sets[s]]: for error_msg in pset.errors: - sys.stderr.write("%s\n" % (error_msg,)) + writemsg_level("%s\n" % (error_msg,), + level=logging.ERROR, noiselevel=-1) writemsg_level(("emerge: the given set '%s' " "contains a non-existent set named '%s'.\n") % \ @@ -7076,8 +7077,9 @@ class depgraph(object): for depgraph_sets in self._dynamic_config.sets.values(): for pset in depgraph_sets.sets.values(): - for e in pset.errors: - sys.stderr.write("%s\n" % (e,)) + for error_msg in pset.errors: + writemsg_level("%s\n" % (error_msg,), + level=logging.ERROR, noiselevel=-1) # TODO: Add generic support for "set problem" handlers so that # the below warnings aren't special cases for world only.