diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-02-23 07:50:35 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-02-23 07:50:35 +0000 |
| commit | ef448db47287184a5a2dc97321899ab0efc664ab (patch) | |
| tree | 783605891ca1cf3a7a868b53ebf7a386608e2712 | |
| parent | d55e5c104ee0beee2797b01534e100ca5c85d1f4 (diff) | |
| download | pacman-ef448db47287184a5a2dc97321899ab0efc664ab.tar.xz | |
* conflicts are returned with the full path, so prepending root is redundant
| -rw-r--r-- | src/pacman/add.c | 6 | ||||
| -rw-r--r-- | src/pacman/sync.c | 8 |
2 files changed, 5 insertions, 9 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; } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3a06e6ce..585f3765 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -511,7 +511,7 @@ int pacman_sync(alpm_list_t *targets) * when sysupgrade'ing with an older version of pacman. */ data = alpm_trans_get_packages(); - for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { + for(i = data; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); pmpkg_t *spkg = alpm_sync_get_package(sync); if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0 && alpm_list_count(data) > 1) { @@ -706,16 +706,14 @@ int pacman_sync(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; } |