From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1476067-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 38401158010
	for <garchives@archives.gentoo.org>; Wed, 11 Jan 2023 10:30:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4CD71E0BD9;
	Wed, 11 Jan 2023 10:30:14 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 3249BE0BD9
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 10:30:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 15D4B340E84
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 10:30:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 49689824
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 10:30:11 +0000 (UTC)
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" <flow@gentoo.org>
Message-ID: <1673433007.0fc591ecb6046131b65a1996fd6cd8710baeb8fd.flow@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/protobuf-java/protobuf-java-3.21.12.ebuild dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
X-VCS-Directories: dev-java/protobuf-java/
X-VCS-Committer: flow
X-VCS-Committer-Name: Florian Schmaus
X-VCS-Revision: 0fc591ecb6046131b65a1996fd6cd8710baeb8fd
X-VCS-Branch: master
Date: Wed, 11 Jan 2023 10:30:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dfd462db-561c-4b6e-a523-b6a292bd2687
X-Archives-Hash: 876f9122f6244d2d4870af5e78da43c0

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