From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xvfb-run/
Date: Fri, 23 Aug 2024 14:55:01 +0000 (UTC) [thread overview]
Message-ID: <1724424812.26f310b9ab18d3b7ccc04ed121534658726f6246.sam@gentoo> (raw)
commit: 26f310b9ab18d3b7ccc04ed121534658726f6246
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 14:53:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 14:53:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f310b9
x11-misc/xvfb-run: tidy filterdiff use a bit more
I should've dropped the '|| die' consistently in 2e3800a592ff6bfe6fe6075e46ff3e5b6851a2ec.
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild | 2 +-
x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild | 2 +-
x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
index d3f185b1c52f..920d9448d95c 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
@@ -21,7 +21,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
+ filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
assert "filterdiff+patch failed"
eapply_user
}
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
index d3f185b1c52f..920d9448d95c 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
@@ -21,7 +21,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
+ filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
assert "filterdiff+patch failed"
eapply_user
}
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
index d3f185b1c52f..920d9448d95c 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
@@ -21,7 +21,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
+ filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
assert "filterdiff+patch failed"
eapply_user
}
next reply other threads:[~2024-08-23 14:55 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-23 14:55 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-12 16:33 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xvfb-run/ Jakov Smolić
2025-01-12 0:48 Sam James
2025-01-12 0:48 Sam James
2024-12-22 19:38 Sebastian Pipping
2024-12-22 19:38 Sebastian Pipping
2024-10-09 13:58 Sebastian Pipping
2024-08-23 14:55 Sam James
2024-08-23 14:48 Sam James
2024-05-11 7:40 Sebastian Pipping
2024-02-25 13:46 Sebastian Pipping
2023-12-22 2:26 Sebastian Pipping
2023-12-22 2:26 Sebastian Pipping
2023-07-07 0:01 Sam James
2023-07-06 21:02 Sam James
2023-07-06 17:49 Sam James
2023-03-01 3:17 Sebastian Pipping
2022-11-26 18:18 Sebastian Pipping
2022-11-26 18:18 Sebastian Pipping
2021-09-21 13:41 Yixun Lan
2021-09-03 1:53 Sam James
2021-07-19 18:36 Sam James
2021-07-05 22:35 Sam James
2021-05-18 6:29 Agostino Sarubbo
2021-03-09 20:04 Sebastian Pipping
2021-02-03 20:29 Sebastian Pipping
2020-10-16 21:57 Sam James
2020-06-29 6:33 Michał Górny
2020-05-25 12:15 Mikle Kolyada
2020-04-19 21:03 Sebastian Pipping
2017-08-23 18:17 Sebastian Pipping
2017-03-07 9:14 David Seifert
2016-10-10 19:06 Sebastian Pipping
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1724424812.26f310b9ab18d3b7ccc04ed121534658726f6246.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox