[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

[Florian Schmaus]

commit:     0fc591ecb6046131b65a1996fd6cd8710baeb8fd
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 10:29:47 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 10:30:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc591ec

dev-java/protobuf-java: use 'assert' instead of 'die' for shell pipelines

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/protobuf-java/protobuf-java-3.21.12.ebuild   | 3 ++-
 dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
index da7ae95555d7..7885a6ab21ee 100644
--- a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
@@ -55,7 +55,8 @@ src_prepare() {
                "${S}/core/pom.xml") > "${T}/core_proto" || die "echo to 
core_proto failed"
        # Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS
        pushd "${JAVA_RESOURCE_DIRS}" || die
-               jar cv "@${T}/core_proto" | jar xv || die "Copying protos 
failed"
+       jar cv "@${T}/core_proto" | jar xv
+       assert"Copying protos failed"
        popd || die
 
        # 
https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-sources-build.xml

diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
index 9dc32c355b91..ef157767a703 100644
--- a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
@@ -52,7 +52,8 @@ src_prepare() {
                "${S}/core/pom.xml") > "${T}/core_proto" || die "echo to 
core_proto failed"
        # Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS
        pushd "${JAVA_RESOURCE_DIRS}" || die
-               jar cv "@${T}/core_proto" | jar xv || die "Copying protos 
failed"
+       jar cv "@${T}/core_proto" | jar xv
+       assert "Copying protos failed"
        popd || die
 
        # 
https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml