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

two string fixes.

Browse Source 
* added a newline to a conflict message in add.c
* removed the trailing dot in a replace message in callback.c.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
Chantry Xavier 2008-01-20 14:11:25 +01:00 committed by Dan McGee
parent 73ee64d49f
commit bba62655fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pacman/add.c
View File

@ -146,7 +146,7 @@ int pacman_add(alpm_list_t *targets)
case PM_ERR_CONFLICTING_DEPS: case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
pmconflict_t *conflict = alpm_list_getdata(i); pmconflict_t *conflict = alpm_list_getdata(i);
printf(_(":: %s: conflicts with %s"), printf(_(":: %s: conflicts with %s\n"),
alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict));
} }
break; break;

2
src/pacman/callback.c
View File

@ -285,7 +285,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
alpm_pkg_get_name(data2)); alpm_pkg_get_name(data2));
*response = yesno(str); *response = yesno(str);
} else { } else {
printf(_("Replacing %s with %s/%s\n."), printf(_("Replacing %s with %s/%s\n"),
alpm_pkg_get_name(data1), alpm_pkg_get_name(data1),
(char *)data3, (char *)data3,
alpm_pkg_get_name(data2)); alpm_pkg_get_name(data2));