clarify broken dependency error messages

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2017-07-08 20:33:18 -04:00 committed by Allan McRae
parent fa8419a0b5
commit 2b1b7b7075

View file

@ -717,15 +717,16 @@ static void print_broken_dep(alpm_depmissing_t *miss)
alpm_pkg_t *pkg; alpm_pkg_t *pkg;
if(miss->causingpkg == NULL) { if(miss->causingpkg == NULL) {
/* package being installed/upgraded has unresolved dependency */ /* package being installed/upgraded has unresolved dependency */
colon_printf(_("%s: requires %s\n"), miss->target, depstring); colon_printf(_("unable to satisfy dependency '%s' required by %s\n"),
depstring, miss->target);
} else if((pkg = alpm_pkg_find(trans_add, miss->causingpkg))) { } else if((pkg = alpm_pkg_find(trans_add, miss->causingpkg))) {
/* upgrading a package breaks a local dependency */ /* upgrading a package breaks a local dependency */
colon_printf(_("%s: installing %s (%s) breaks dependency '%s'\n"), colon_printf(_("installing %s (%s) breaks dependency '%s' required by %s\n"),
miss->target, miss->causingpkg, alpm_pkg_get_version(pkg), depstring); miss->causingpkg, alpm_pkg_get_version(pkg), depstring, miss->target);
} else { } else {
/* removing a package breaks a local dependency */ /* removing a package breaks a local dependency */
colon_printf(_("%s: removing %s breaks dependency '%s'\n"), colon_printf(_("removing %s breaks dependency '%s' required by %s\n"),
miss->target, miss->causingpkg, depstring); miss->causingpkg, depstring, miss->target);
} }
free(depstring); free(depstring);
} }