summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2007-11-10 18:11:40 +0100
committerDan McGee <dan@archlinux.org>2007-11-11 16:56:50 +0100
commitb6b3b0135edd7bf0fae43bfe522e41cfa5eb0d9b (patch)
tree6e755487dd1b8bd8c5c1ff9c5f431906bd812532
parent434ea5bf619cd27d99d4b443fe058bf46cc5d7b2 (diff)
downloadpacman-b6b3b0135edd7bf0fae43bfe522e41cfa5eb0d9b.tar.gz
pacman-b6b3b0135edd7bf0fae43bfe522e41cfa5eb0d9b.tar.xz
Incorrect usage of alpm_db_whatprovides in sync.c
The old code thought that alpm_db_whatprovides returns with a list of strings (package names). Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/sync.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 40766914..336b5848 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -279,9 +279,9 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
if(!p) {
RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
}
+ spkg = (pmpkg_t *) p->data;
_alpm_log(PM_LOG_DEBUG, "found '%s' as a provision for '%s'\n",
- (char *)p->data, targ);
- spkg = _alpm_db_get_pkgfromcache(db, p->data);
+ alpm_pkg_get_name(spkg), targ);
alpm_list_free(p);
}
}
@@ -303,9 +303,9 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
pmdb_t *db = j->data;
alpm_list_t *p = _alpm_db_whatprovides(db, targ);
if(p) {
+ spkg = (pmpkg_t *) p->data;
_alpm_log(PM_LOG_DEBUG, "found '%s' as a provision for '%s' in db '%s'\n",
- (char *)p->data, targ, db->treename);
- spkg = _alpm_db_get_pkgfromcache(db, p->data);
+ alpm_pkg_get_name(spkg), targ, db->treename);
alpm_list_free(p);
}
}