commit: 78bb69447833895b588bbed42f02b364d3ebbfcc Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Apr 20 22:11:29 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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 <mrueg <AT> 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
