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

pacman: print additional error information to stderr

Browse source 
Prints extra information provided by file conflict or corrupt package messages
to stderr instead of stdout

Signed-off-by: Oskar Roesler (bionade24) <o.roesler@oscloud.info>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Oskar Roesler (bionade24) via pacman-dev 2021-06-03 11:16:30 +02:00 • committed by Allan McRae
parent 58c81fa213
commit 9f23654722
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pacman/sync.c
View file

@ -836,15 +836,15 @@ int sync_prepare_execute(void)
alpm_fileconflict_t *conflict = i->data; alpm_fileconflict_t *conflict = i->data;
switch(conflict->type) { switch(conflict->type) {
case ALPM_FILECONFLICT_TARGET: case ALPM_FILECONFLICT_TARGET:
printf(_("%s exists in both '%s' and '%s'\n"), fprintf(stderr, _("%s exists in both '%s' and '%s'\n"),
conflict->file, conflict->target, conflict->ctarget); conflict->file, conflict->target, conflict->ctarget);
break; break;
case ALPM_FILECONFLICT_FILESYSTEM: case ALPM_FILECONFLICT_FILESYSTEM:
if(conflict->ctarget[0]) { if(conflict->ctarget[0]) {
printf(_("%s: %s exists in filesystem (owned by %s)\n"), fprintf(stderr, _("%s: %s exists in filesystem (owned by %s)\n"),
conflict->target, conflict->file, conflict->ctarget); conflict->target, conflict->file, conflict->ctarget);
} else { } else {
printf(_("%s: %s exists in filesystem\n"), fprintf(stderr, _("%s: %s exists in filesystem\n"),
conflict->target, conflict->file); conflict->target, conflict->file);
} }
break; break;
@ -857,7 +857,7 @@ int sync_prepare_execute(void)
case ALPM_ERR_PKG_INVALID_SIG: case ALPM_ERR_PKG_INVALID_SIG:
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
char *filename = i->data; char *filename = i->data;
printf(_("%s is invalid or corrupted\n"), filename); fprintf(stderr, _("%s is invalid or corrupted\n"), filename);
free(filename); free(filename);
} }
break; break;