diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2017-04-16 00:12:56 +0200 |
|---|---|---|
| committer | Andrew Gregory <andrew.gregory.8@gmail.com> | 2017-04-17 01:41:35 +0200 |
| commit | 6d1dcf7937ba3739d17eda614591d1f59ac0bf3a (patch) | |
| tree | caa2ccc7815cc1c0dc95b36c20a0d4287f74a3ac /src | |
| parent | 16b91f798faf6413f9b043543c5c0c3467b6fdbf (diff) | |
| download | pacman-6d1dcf7937ba3739d17eda614591d1f59ac0bf3a.tar.gz pacman-6d1dcf7937ba3739d17eda614591d1f59ac0bf3a.tar.xz | |
conflict: include owner for filesystem conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/sync.c | 9 |
1 files changed, 7 insertions, 2 deletions
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); |