Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] emerge --config: return pkg_config exit status (bug 653638)
Date: Fri, 20 Apr 2018 22:18:42
Message-Id: 20180420221827.6832-1-zmedico@gentoo.org
1 Fix emerge --config exit status so that it will return 1 if
2 the pkg_config function calls die.
3
4 Bug: https://bugs.gentoo.org/653638
5 ---
6 pym/_emerge/actions.py | 3 ++-
7 1 file changed, 2 insertions(+), 1 deletion(-)
8
9 diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
10 index b90aa8cb0..1a289f523 100644
11 --- a/pym/_emerge/actions.py
12 +++ b/pym/_emerge/actions.py
13 @@ -617,6 +617,7 @@ def action_config(settings, trees, myopts, myfiles):
14 portage.doebuild(ebuildpath, "clean", settings=mysettings,
15 debug=debug, mydbapi=vardb, tree="vartree")
16 print()
17 + return retval
18
19 def action_depclean(settings, trees, ldpath_mtimes,
20 myopts, action, myfiles, spinner, scheduler=None):
21 @@ -3203,7 +3204,7 @@ def run_action(emerge_config):
22 # HELP action
23 elif "config" == emerge_config.action:
24 validate_ebuild_environment(emerge_config.trees)
25 - action_config(emerge_config.target_config.settings,
26 + return action_config(emerge_config.target_config.settings,
27 emerge_config.trees, emerge_config.opts, emerge_config.args)
28
29 # SEARCH action
30 --
31 2.13.6