Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 04 Mar 2022 16:24:11
Message-Id: 1646410411.f9ee55e698f8c035fb549a59badbddc5409f3a4b.williamh@gentoo
1 commit: f9ee55e698f8c035fb549a59badbddc5409f3a4b
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 4 16:13:31 2022 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 4 16:13:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ee55e6
7
8 go-module.eclass: use ego helper function
9
10 All direct calls to go in eclasses or ebuilds should be done via the ego
11 helper function.
12
13 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
14
15 eclass/go-module.eclass | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18 diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
19 index 66fe52c9ad72..b5949e60b4ea 100644
20 --- a/eclass/go-module.eclass
21 +++ b/eclass/go-module.eclass
22 @@ -435,7 +435,7 @@ _go-module_src_unpack_verify_gosum() {
23 # This will print 'downloading' messages, but it's accessing content from
24 # the $GOPROXY file:/// URL!
25 einfo "Tidying go.mod/go.sum"
26 - go mod tidy >/dev/null
27 + ego mod tidy >/dev/null
28
29 # This used to call 'go get' to verify by fetching everything from the main
30 # go.mod. However 'go get' also turns out to recursively try to fetch
31 @@ -461,7 +461,7 @@ go-module_live_vendor() {
32 die "${FUNCNAME} only allowed when upstream isn't vendoring"
33
34 pushd "${S}" >& /dev/null || die
35 - go mod vendor || die
36 + ego mod vendor
37 popd >& /dev/null || die
38 }