x11-misc/xvfb-run: fix filterdiff error handling

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-08-23 15:45:41 +01:00
parent 4f778cd76d
commit 2e3800a592
4 changed files with 7 additions and 3 deletions
+2 -1
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,6 +22,7 @@ S="${WORKDIR}"/
src_prepare() {
# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
assert "filterdiff+patch failed"
eapply_user
}
@@ -22,6 +22,7 @@ S="${WORKDIR}"/
src_prepare() {
# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
assert "filterdiff+patch failed"
eapply_user
}
@@ -22,6 +22,7 @@ S="${WORKDIR}"/
src_prepare() {
# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
assert "filterdiff+patch failed"
eapply_user
}
+3 -2
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,7 +22,8 @@ S="${WORKDIR}"/
src_prepare() {
# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
assert "filterdiff+patch failed"
eapply_user
}