diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2007-10-27 01:14:35 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-10-27 01:54:21 +0200 |
| commit | d903fc607ee2aa2527202f1e54a44be325eabe48 (patch) | |
| tree | ce93a474cfe1a6a52d5c55c6bad0dba8e4fe6195 /lib/libalpm | |
| parent | b609cb0a5dfe595318975dfe4c6c37a168b7d979 (diff) | |
| download | pacman-d903fc607ee2aa2527202f1e54a44be325eabe48.tar.gz pacman-d903fc607ee2aa2527202f1e54a44be325eabe48.tar.xz | |
Dependency error/log messages fix
The old code used only the depend.name in messages, which might have not
been informative. The new code uses the whole dependency string in
%DEPENDS% format.
(Dan: slight English clarification in one of the messages)
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/deps.c | 18 | ||||
| -rw-r--r-- | lib/libalpm/sync.c | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7f4fb0b5..14261aec 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -306,7 +306,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, if(alpm_depcmp(pkg, depend)) { _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' has moved from '%s' to '%s'\n", - depend->name, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg)); + k->data, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -322,7 +322,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, /* we ignore packages that will be updated because we know * that the updated ones don't satisfy depend */ _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' satisfied by installed package '%s'\n", - depend->name, alpm_pkg_get_name(pkg)); + k->data, alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -380,7 +380,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, /* else if still not found... */ if(!found) { _alpm_log(PM_LOG_DEBUG, "missing dependency '%s' for package '%s'\n", - depend->name, alpm_pkg_get_name(tp)); + j->data, alpm_pkg_get_name(tp)); miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { @@ -426,7 +426,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, pmpkg_t *pkg = l->data; if(alpm_depcmp(pkg, depend) && !_alpm_pkg_find(alpm_pkg_get_name(pkg), packages)) { _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' satisfied by installed package '%s'\n", - depend->name, alpm_pkg_get_name(pkg)); + k->data, alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -686,8 +686,10 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, for(j = *list; j && !found; j = j->next) { pmpkg_t *sp = j->data; if(alpm_depcmp(sp, missdep)) { + char *missdepstring = alpm_dep_get_string(missdep); _alpm_log(PM_LOG_DEBUG, "%s satisfies dependency %s -- skipping\n", - alpm_pkg_get_name(sp), missdep->name); + alpm_pkg_get_name(sp), missdepstring); + free(missdepstring); found = 1; } } @@ -713,8 +715,10 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, } if(!found) { - _alpm_log(PM_LOG_ERROR, _("cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)\n"), - miss->target, missdep->name); + char *missdepstring = alpm_dep_get_string(missdep); + _alpm_log(PM_LOG_ERROR, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), + missdepstring, miss->target); + free(missdepstring); if(data) { if((miss = malloc(sizeof(pmdepmissing_t))) == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes\n"), sizeof(pmdepmissing_t)); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3e12ffb5..f4ed6dd3 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -674,8 +674,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync pmsyncpkg_t *sp = l->data; pmpkg_t *sppkg = sp->pkg; if(alpm_depcmp(sppkg, &(miss->depend))) { + char *missdepstring = alpm_dep_get_string(&(miss->depend)); _alpm_log(PM_LOG_DEBUG, "sync: dependency '%s' satisfied by package '%s'\n", - miss->depend.name, alpm_pkg_get_name(sppkg)); + missdepstring, alpm_pkg_get_name(sppkg)); + free(missdepstring); satisfied = 1; } } |