From 6d1dcf7937ba3739d17eda614591d1f59ac0bf3a Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sat, 15 Apr 2017 18:12:56 -0400 Subject: conflict: include owner for filesystem conflicts Signed-off-by: Andrew Gregory --- src/pacman/sync.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e37b91c7..680d7b3e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -823,8 +823,13 @@ int sync_prepare_execute(void) conflict->file, conflict->target, conflict->ctarget); break; case ALPM_FILECONFLICT_FILESYSTEM: - printf(_("%s: %s exists in filesystem\n"), - conflict->target, conflict->file); + if(conflict->ctarget[0]) { + printf(_("%s: %s exists in filesystem (owned by %s)\n"), + conflict->target, conflict->file, conflict->ctarget); + } else { + printf(_("%s: %s exists in filesystem\n"), + conflict->target, conflict->file); + } break; } alpm_fileconflict_free(conflict); -- cgit v1.2.3-70-g09d2