On 1/18/07, Dan McGee <dpmcgee@gmail.com> wrote:
The MSG simply needs a \n at the end of it (I patched it locally when looking at this last night, but not in the CVS build I ran the above with).
Requested patch. Definitely has line wrap issues, but not hard to apply by hand- the only difference at each line that changed is the addition of a \n. --- pacman-lib.orig/src/pacman/add.c 2006-11-22 04:03:42.000000000 -0500 +++ pacman-lib/src/pacman/add.c 2007-01-18 02:15:03.000000000 -0500 @@ -94,7 +94,7 @@ int pacman_add(list_t *targets) case PM_ERR_UNSATISFIED_DEPS: for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - MSG(NL, _(":: %s: requires %s"), alpm_dep_get_target(miss), + MSG(NL, _(":: %s: requires %s\n"), alpm_dep_get_target(miss), alpm_dep_get_name(miss)); switch(alpm_dep_get_mod(miss)) { case PM_DEP_MOD_EQ: MSG(CL, "=%s", alpm_dep_get_version(miss)); break; @@ -107,7 +107,7 @@ int pacman_add(list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - MSG(NL, _(":: %s: conflicts with %s"), + MSG(NL, _(":: %s: conflicts with %s\n"), alpm_dep_get_target(miss), alpm_dep_get_name(miss)); } break; @@ -116,14 +116,14 @@ int pacman_add(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 \"%s\" (target) and \"%s\" (target)"), + MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)\n"), config->root, 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"), + MSG(NL, _("%s: %s%s exists in filesystem\n"), alpm_conflict_get_target(conflict), config->root, alpm_conflict_get_file(conflict)); --- pacman-lib.orig/src/pacman/sync.c 2007-01-18 15:14:25.000000000 -0500 +++ pacman-lib/src/pacman/sync.c 2007-01-18 15:37:17.000000000 -0500 @@ -727,14 +727,14 @@ int pacman_sync(list_t *targets) pmconflict_t *conflict = alpm_list_getdata(lp); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)"), + MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)\n"), config->root, 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"), + MSG(NL, _("%s: %s%s exists in filesystem\n"), alpm_conflict_get_target(conflict), config->root, alpm_conflict_get_file(conflict));