diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-12-01 09:32:29 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-12-01 09:32:29 +0000 |
| commit | 08dca1593f82dfa4b5f1199b5b1f4d7099719be9 (patch) | |
| tree | b1b383f93524ebfcb5bfcc98924668f29dc88ba3 /lib/libalpm/deps.c | |
| parent | 6c68723905ba1d8cee83e4af88b0ac8ee9a408aa (diff) | |
| download | pacman-08dca1593f82dfa4b5f1199b5b1f4d7099719be9.tar.xz | |
* Cosmetic changes and typo fixes
* IgnorePkg and --ignore work again
* Partial changes to support removal of conflicts for -U and -A (INCOMPLETE)
Diffstat (limited to 'lib/libalpm/deps.c')
| -rw-r--r-- | lib/libalpm/deps.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 97c527ab..7b870085 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -332,7 +332,8 @@ pmlist_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, unsigned char op, pmlist found=0; for(j = tp->requiredby; j; j = j->next) { - if(!_alpm_list_is_strin((char *)j->data, packages)) { + char *reqname = j->data; + if(!_alpm_list_is_strin(reqname, packages)) { /* check if a package in trans->packages provides this package */ for(k=trans->packages; !found && k; k=k->next) { pmpkg_t *spkg = NULL; @@ -347,7 +348,7 @@ pmlist_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, unsigned char op, pmlist } } if(!found) { - _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), (char *)j->data, tp->name); + _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), reqname, tp->name); miss = _alpm_depmiss_new(tp->name, PM_DEP_TYPE_REQUIRED, PM_DEP_MOD_ANY, j->data, NULL); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = _alpm_list_add(baddeps, miss); |