From 4c93e63ddfddee5cfe65a655d5dc9e3eb4c991b3 Mon Sep 17 00:00:00 2001 From: Ronan Pigott Date: Sun, 3 Dec 2023 18:53:01 -0700 Subject: [PATCH] add.c: drop newline in permission and ownership log messages These are the only log messages produced by pacman that include an embedded newline, and it looks very incongruous in a typical pacman.log. Signed-off-by: Allan McRae --- lib/libalpm/add.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 02fec676..26cec996 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -262,7 +262,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, entrymode & mask); alpm_logaction(handle, ALPM_CALLER_PREFIX, - "warning: directory permissions differ on %s\n" + "warning: directory permissions differ on %s, " "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, entrymode & mask); } @@ -277,7 +277,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, "filesystem: %u:%u package: %u:%u\n"), filename, lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); alpm_logaction(handle, ALPM_CALLER_PREFIX, - "warning: directory ownership differs on %s\n" + "warning: directory ownership differs on %s, " "filesystem: %u:%u package: %u:%u\n", filename, lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); }