From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AFB3A139085 for ; Thu, 26 Jan 2017 04:19:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4AF8E0E15; Thu, 26 Jan 2017 04:19:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C45F3E0E15 for ; Thu, 26 Jan 2017 04:19:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8A73340EE8 for ; Thu, 26 Jan 2017 04:19:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E829B2FCD for ; Thu, 26 Jan 2017 04:19:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1485404303.65d2cc0514c0c91bb47ed78142446a8eb7d75a26.floppym@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/post_emerge.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 65d2cc0514c0c91bb47ed78142446a8eb7d75a26 X-VCS-Branch: master Date: Thu, 26 Jan 2017 04:19:51 +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: b11e5a02-c431-41c6-a938-6596a17e4a87 X-Archives-Hash: 5831d900eec462578bf6e451b00c7f35 commit: 65d2cc0514c0c91bb47ed78142446a8eb7d75a26 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 26 03:13:34 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Jan 26 04:18:23 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=65d2cc05 emerge: fix error handling for clean_logs CleanLogs.clean() now returns a tuple (returncode, messages). Fixes: f143e58dd3fd ("emaint: exit with non-zero status code when module fails (bug 567478)") X-Gentoo-Bug: 607236 X-Gentoo-Bug-URL: https://bugs.gentoo.org/607236 pym/_emerge/post_emerge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/post_emerge.py b/pym/_emerge/post_emerge.py index 0cb533c..7e6063c 100644 --- a/pym/_emerge/post_emerge.py +++ b/pym/_emerge/post_emerge.py @@ -29,10 +29,10 @@ def clean_logs(settings): return cleanlogs = CleanLogs() - errors = cleanlogs.clean(settings=settings) - if errors: + returncode, msgs = cleanlogs.clean(settings=settings) + if not returncode: out = portage.output.EOutput() - for msg in errors: + for msg in msgs: out.eerror(msg) def display_news_notification(root_config, myopts):