From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
Date: Thu, 18 Apr 2024 15:19:51 +0000 (UTC) [thread overview]
Message-ID: <1713453478.08925ddd173f638b78303c4c958d4c98a41c60d6.floppym@gentoo> (raw)
commit: 08925ddd173f638b78303c4c958d4c98a41c60d6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 15:17:58 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 15:17:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08925ddd
sys-apps/systemd: update systemd-test-process-util.patch
Insert empty lines to maintain line numbering for subsequent tests.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/systemd-test-process-util.patch | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/sys-apps/systemd/files/systemd-test-process-util.patch b/sys-apps/systemd/files/systemd-test-process-util.patch
index ec1a766764ee..92c7eaf29577 100644
--- a/sys-apps/systemd/files/systemd-test-process-util.patch
+++ b/sys-apps/systemd/files/systemd-test-process-util.patch
@@ -1,4 +1,4 @@
-From 1d3404701bf0c27600dd44b2814cd6caffca877a Mon Sep 17 00:00:00 2001
+From c3f91c76af292e3bd2c6e2b12e37de88cf5d7c72 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 18 Apr 2024 00:04:44 -0400
Subject: [PATCH] test-process-util: remove assert that fails under pid-sandbox
@@ -8,23 +8,24 @@ Upstream refuses to fix this.
Bug: https://bugs.gentoo.org/674458
Bug: https://github.com/systemd/systemd/issues/25015
---
- src/test/test-process-util.c | 3 ---
- 1 file changed, 3 deletions(-)
+ src/test/test-process-util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
-index c96bd4341b..4009cf96e2 100644
+index c96bd4341b..9ff1bdc082 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
-@@ -92,9 +92,6 @@ static void test_pid_get_comm_one(pid_t pid) {
+@@ -92,8 +92,8 @@ static void test_pid_get_comm_one(pid_t pid) {
assert_se(r >= 0 || r == -EACCES);
log_info("PID"PID_FMT" strlen(environ): %zi", pid, env ? (ssize_t)strlen(env) : (ssize_t)-errno);
- if (!detect_container())
- assert_se(get_ctty_devnr(pid, &h) == -ENXIO || pid != 1);
--
++
++
+
(void) getenv_for_pid(pid, "PATH", &i);
log_info("PID"PID_FMT" $PATH: '%s'", pid, strna(i));
- }
--
2.44.0
next reply other threads:[~2024-04-18 15:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 15:19 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-20 8:01 [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/ Joonas Niilola
2024-06-17 22:36 Conrad Kostecki
2023-10-01 7:34 Sam James
2023-08-13 17:32 Mike Gilbert
2023-05-06 17:55 Mike Gilbert
2023-04-22 18:16 Mike Gilbert
2023-01-01 18:16 Conrad Kostecki
2022-10-19 18:13 Mike Gilbert
2022-08-04 18:39 Mike Gilbert
2022-07-19 17:10 Conrad Kostecki
2020-03-06 19:20 Mike Gilbert
2019-08-02 20:41 Mike Gilbert
2019-07-10 19:18 Mike Gilbert
2019-06-08 20:44 Mike Gilbert
2018-06-04 15:09 Mike Gilbert
2018-06-04 15:09 Mike Gilbert
2018-05-27 16:11 Aaron Bauman
2018-04-03 18:23 Mike Gilbert
2018-02-13 22:15 Mike Gilbert
2017-12-07 0:18 Mike Gilbert
2017-10-18 18:39 Mike Gilbert
2017-08-29 22:21 Mike Gilbert
2016-11-04 1:06 Mike Gilbert
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=1713453478.08925ddd173f638b78303c4c958d4c98a41c60d6.floppym@gentoo \
--to=floppym@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