bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add.c: drop newline in permission and ownership log messages

Browse source 
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 <allan@archlinux.org>
This commit is contained in:
Ronan Pigott 2023-12-03 18:53:01 -07:00 • committed by Allan McRae
parent f69d9b4475
commit 4c93e63ddf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/add.c
View file

@ -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, "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask,
entrymode & mask); entrymode & mask);
alpm_logaction(handle, ALPM_CALLER_PREFIX, 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, "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask,
entrymode & 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, "filesystem: %u:%u package: %u:%u\n"), filename,
lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid);
alpm_logaction(handle, ALPM_CALLER_PREFIX, 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, "filesystem: %u:%u package: %u:%u\n", filename,
lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid);
} }