commit: 2ad9100728886b7a73ed2eba0710e3ab29622f52 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Mon Mar 7 08:43:52 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 8 13:27:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad91007
go-module.eclass: invoke "ego mod tidy" with nonfatal We previously invoked "mod tidy" without the ego helper function in a non-fatal way. This was switched to using the ego helper in f9ee55e698f8 ("go-module.eclass: use ego helper function") but without prefixing the call with nonfatal. Hence the semantic of the eclass changes: a previously non-fatal invocation became fatal, causing e.g., bug #834695. [sam: fixes semantic change which wasn't advertised/seemingly intentional, so let's get this in now to avoid a significant number of ebuilds being broken. We can introduce this change if desired at a later point. Fixes: f9ee55e698f8 ("go-module.eclass: use ego helper function") Closes: https://bugs.gentoo.org/834758 Closes: https://bugs.gentoo.org/834762 Closes: https://bugs.gentoo.org/834607 Closes: https://bugs.gentoo.org/834608 Closes: https://bugs.gentoo.org/834625 Closes: https://bugs.gentoo.org/834626 Closes: https://bugs.gentoo.org/834630 Closes: https://bugs.gentoo.org/834669 Closes: https://bugs.gentoo.org/834603 Closes: https://bugs.gentoo.org/834610 Closes: https://bugs.gentoo.org/834711 Closes: https://bugs.gentoo.org/834763 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/24437 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/go-module.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass index 56f42c898845..817f8a9fd3e0 100644 --- a/eclass/go-module.eclass +++ b/eclass/go-module.eclass @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: go-module.eclass @@ -451,7 +451,7 @@ _go-module_src_unpack_verify_gosum() { # This will print 'downloading' messages, but it's accessing content from # the $GOPROXY file:/// URL! einfo "Tidying go.mod/go.sum" - ego mod tidy >/dev/null + nonfatal ego mod tidy >/dev/null # This used to call 'go get' to verify by fetching everything from the main # go.mod. However 'go get' also turns out to recursively try to fetch