diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-02-23 08:50:35 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-02-23 08:50:35 +0100 |
| commit | ef448db47287184a5a2dc97321899ab0efc664ab (patch) | |
| tree | 783605891ca1cf3a7a868b53ebf7a386608e2712 /src/pacman/add.c | |
| parent | d55e5c104ee0beee2797b01534e100ca5c85d1f4 (diff) | |
| download | pacman-ef448db47287184a5a2dc97321899ab0efc664ab.tar.gz pacman-ef448db47287184a5a2dc97321899ab0efc664ab.tar.xz | |
* conflicts are returned with the full path, so prepending root is redundant
Diffstat (limited to 'src/pacman/add.c')
| -rw-r--r-- | src/pacman/add.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/pacman/add.c b/src/pacman/add.c index acfbe096..14bb3710 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -124,16 +124,14 @@ int pacman_add(alpm_list_t *targets) pmconflict_t *conflict = alpm_list_getdata(i); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in both '%s' and '%s'\n"), - alpm_option_get_root(), + MSG(NL, _("%s exists in both '%s' and '%s'\n"), alpm_conflict_get_file(conflict), alpm_conflict_get_target(conflict), alpm_conflict_get_ctarget(conflict)); break; case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem\n"), + MSG(NL, _("%s: %s exists in filesystem\n"), alpm_conflict_get_target(conflict), - alpm_option_get_root(), alpm_conflict_get_file(conflict)); break; } |