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 70E5F1382C5 for ; Tue, 24 Apr 2018 19:43:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 828E6E08F5; Tue, 24 Apr 2018 19:43:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E28EE08F5 for ; Tue, 24 Apr 2018 19:43:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C04F335C07 for ; Tue, 24 Apr 2018 19:43:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C774288 for ; Tue, 24 Apr 2018 19:43:30 +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: <1524598947.78bb69447833895b588bbed42f02b364d3ebbfcc.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 78bb69447833895b588bbed42f02b364d3ebbfcc X-VCS-Branch: master Date: Tue, 24 Apr 2018 19:43:30 +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: 1a1b55d5-3065-4ab7-ab7f-b94b49a8e558 X-Archives-Hash: e5cb487752a989dbbbcc09aacbfacd0d commit: 78bb69447833895b588bbed42f02b364d3ebbfcc Author: Zac Medico gentoo org> AuthorDate: Fri Apr 20 22:11:29 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Apr 24 19:42:27 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=78bb6944 emerge --config: return pkg_config exit status (bug 653638) Fix emerge --config exit status so that it will return 1 if the pkg_config function calls die. Bug: https://bugs.gentoo.org/653638 Reviewed-by: Manuel Rüger gentoo.org> pym/_emerge/actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index b90aa8cb0..1a289f523 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -617,6 +617,7 @@ def action_config(settings, trees, myopts, myfiles): portage.doebuild(ebuildpath, "clean", settings=mysettings, debug=debug, mydbapi=vardb, tree="vartree") print() + return retval def action_depclean(settings, trees, ldpath_mtimes, myopts, action, myfiles, spinner, scheduler=None): @@ -3203,7 +3204,7 @@ def run_action(emerge_config): # HELP action elif "config" == emerge_config.action: validate_ebuild_environment(emerge_config.trees) - action_config(emerge_config.target_config.settings, + return action_config(emerge_config.target_config.settings, emerge_config.trees, emerge_config.opts, emerge_config.args) # SEARCH action