From 0b3c67984e6d45e44b130e2cdc71db8577d058f5 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 30 Mar 2022 19:16:00 +0200
Subject: llvm.org.eclass: Fix patch removal test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix the test for patch removal to detect non-matching patches correctly.
-s is not a reliable test for empty directories.  However, grep
indicates whether at least one match was found, so it should be good
enough for us.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/llvm.org.eclass | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'eclass')

diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 2c5f1f9b79e5..fa23782cc244 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -300,15 +300,10 @@ llvm.org_src_unpack() {
 		grep -E -r -L "^Gentoo-Component:.*(${components[*]})" \
 			"${WORKDIR}/llvm-gentoo-patchset-${LLVM_PATCHSET}" |
 			xargs rm
-		assert
-
-		if ver_test -ge 13.0.1_rc3; then
-			# fail if no patches remain
-			if [[ ! -s ${WORKDIR}/llvm-gentoo-patchset-${LLVM_PATCHSET} ]]
-			then
-				die "No patches in the patchset apply to the package"
-			fi
-		fi
+		local status=( "${PIPESTATUS[@]}" )
+		[[ ${status[1]} -ne 0 ]] && die "rm failed"
+		[[ ${status[0]} -ne 0 ]] &&
+			die "No patches in the patchset apply to the package"
 	fi
 }
 
-- 
cgit v1.2.3-65-gdbad