Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 01 May 2021 05:21:40
Message-Id: 1619845882.922cd9af2eedc7e9dc5b8cae7dff419b53beefb5.graaff@gentoo
1 commit: 922cd9af2eedc7e9dc5b8cae7dff419b53beefb5
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 1 05:08:07 2021 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 05:11:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922cd9af
7
8 ruby-ng.eclass: die on errors in ruby_rbconfig_value
9
10 Die on errors in ruby_rbconfig_value, so that any issues with it cause
11 an immediate stop, rather than returning a nil value which may
12 propagate into installed ebuilds and cause hard-to-diagnose issues.
13
14 Closes: https://bugs.gentoo.org/776322
15
16 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
17
18 eclass/ruby-ng.eclass | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21 diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
22 index 0dd65b894c8..0c569bfcdcc 100644
23 --- a/eclass/ruby-ng.eclass
24 +++ b/eclass/ruby-ng.eclass
25 @@ -607,7 +607,7 @@ ruby-ng_src_install() {
26 # @USAGE: rbconfig item
27 # @RETURN: Returns the value of the given rbconfig item of the Ruby interpreter in ${RUBY}.
28 ruby_rbconfig_value() {
29 - echo $(${RUBY} --disable=did_you_mean -rrbconfig -e "puts RbConfig::CONFIG['$1']")
30 + echo $(${RUBY} --disable=did_you_mean -rrbconfig -e "puts RbConfig::CONFIG['$1']" || die "Could not read ruby configuration for '${1}'")
31 }
32
33 # @FUNCTION: doruby