commit: 673d98d340be8a49f6c7360d8f5b9d6e0cfb100b Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> AuthorDate: Tue Jan 24 12:21:30 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 25 06:10:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=673d98d3
dev-util/gyp: fix faulty sed usage It currently mis-replaces `from six.moves import collections_abc`, giving `from ... import collections.abc_abc` which is invalid syntax. Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/29241 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/gyp/gyp-99999999999999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild index cc8257c39716..22b7cac6dc60 100644 --- a/dev-util/gyp/gyp-99999999999999.ebuild +++ b/dev-util/gyp/gyp-99999999999999.ebuild @@ -35,12 +35,12 @@ python_prepare_all() { sed -e "s/' Linux %s' % ' '\.join(platform.linux_distribution())/' Linux'/" -i gyptest.py || die sed \ - -e "s/import collections/import collections.abc/" \ + -e "s/^import collections/import collections.abc/" \ -e "s/collections\.MutableSet/collections.abc.MutableSet/" \ -i pylib/gyp/common.py || die sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i pylib/gyp/input.py || die sed \ - -e "s/import collections/import collections.abc/" \ + -e "s/^import collections/import collections.abc/" \ -e "s/collections\.Iterable/collections.abc.Iterable/" \ -i pylib/gyp/msvs_emulation.py || die sed \
