llvm.org.eclass: Fix patch removal test

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>
This commit is contained in:
Michał Górny
2022-03-30 19:16:00 +02:00
parent bbd34e40e3
commit 0b3c67984e

View File

@@ -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
}