moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 08:18:51 -05:00
Code Issues Releases Wiki Activity

* conflicts are returned with the full path, so prepending root is redundant

Browse Source
This commit is contained in:
Aaron Griffin 2007-02-23 07:50:35 +00:00
parent d55e5c104e
commit ef448db472
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pacman/add.c
View File

@ -124,16 +124,14 @@ int pacman_add(alpm_list_t *targets)
pmconflict_t *conflict = alpm_list_getdata(i); pmconflict_t *conflict = alpm_list_getdata(i);
switch(alpm_conflict_get_type(conflict)) { switch(alpm_conflict_get_type(conflict)) {
case PM_CONFLICT_TYPE_TARGET: case PM_CONFLICT_TYPE_TARGET:
MSG(NL, _("%s%s exists in both '%s' and '%s'\n"), MSG(NL, _("%s exists in both '%s' and '%s'\n"),
alpm_option_get_root(),
alpm_conflict_get_file(conflict), alpm_conflict_get_file(conflict),
alpm_conflict_get_target(conflict), alpm_conflict_get_target(conflict),
alpm_conflict_get_ctarget(conflict)); alpm_conflict_get_ctarget(conflict));
break; break;
case PM_CONFLICT_TYPE_FILE: 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_conflict_get_target(conflict),
alpm_option_get_root(),
alpm_conflict_get_file(conflict)); alpm_conflict_get_file(conflict));
break; break;
} }

8
src/pacman/sync.c
View File

@ -511,7 +511,7 @@ int pacman_sync(alpm_list_t *targets)
* when sysupgrade'ing with an older version of pacman. * when sysupgrade'ing with an older version of pacman.
*/ */
data = alpm_trans_get_packages(); 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); pmsyncpkg_t *sync = alpm_list_getdata(i);
pmpkg_t *spkg = alpm_sync_get_package(sync); pmpkg_t *spkg = alpm_sync_get_package(sync);
if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0 && alpm_list_count(data) > 1) { 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); pmconflict_t *conflict = alpm_list_getdata(i);
switch(alpm_conflict_get_type(conflict)) { switch(alpm_conflict_get_type(conflict)) {
case PM_CONFLICT_TYPE_TARGET: case PM_CONFLICT_TYPE_TARGET:
MSG(NL, _("%s%s exists in both '%s' and '%s'\n"), MSG(NL, _("%s exists in both '%s' and '%s'\n"),
alpm_option_get_root(),
alpm_conflict_get_file(conflict), alpm_conflict_get_file(conflict),
alpm_conflict_get_target(conflict), alpm_conflict_get_target(conflict),
alpm_conflict_get_ctarget(conflict)); alpm_conflict_get_ctarget(conflict));
break; break;
case PM_CONFLICT_TYPE_FILE: 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_conflict_get_target(conflict),
alpm_option_get_root(),
alpm_conflict_get_file(conflict)); alpm_conflict_get_file(conflict));
break; break;
} }