summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/sync.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-20 07:07:10 +0200
committerDan McGee <dan@archlinux.org>2011-06-20 07:07:10 +0200
commit0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e (patch)
tree0596e17d100cb1de355cfd89556ff118d95598a2 /lib/libalpm/sync.c
parenteb2d607899117757971186845930242c4541bfb4 (diff)
parent25b7df4dab61e908a0f86e3aad51f1f5c9ed2ccb (diff)
downloadpacman-0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e.tar.gz
pacman-0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e.tar.xz
Merge branch 'public-structs'
Diffstat (limited to 'lib/libalpm/sync.c')
-rw-r--r--lib/libalpm/sync.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 05735730..15f135ba 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -225,7 +225,7 @@ alpm_list_t SYMEXPORT *alpm_find_grp_pkgs(alpm_list_t *dbs,
if(!grp)
continue;
- for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
+ for(j = grp->packages; j; j = j->next) {
pmpkg_t *pkg = j->data;
if(_alpm_pkg_find(ignorelist, alpm_pkg_get_name(pkg))) {
@@ -705,13 +705,11 @@ static int validate_deltas(pmhandle_t *handle, alpm_list_t *deltas,
for(i = deltas; i; i = i->next) {
pmdelta_t *d = alpm_list_getdata(i);
- const char *filename = alpm_delta_get_filename(d);
- char *filepath = _alpm_filecache_find(handle, filename);
- const char *md5sum = alpm_delta_get_md5sum(d);
+ char *filepath = _alpm_filecache_find(handle, d->delta);
- if(test_md5sum(trans, filepath, md5sum) != 0) {
+ if(test_md5sum(trans, filepath, d->delta_md5) != 0) {
errors++;
- *data = alpm_list_add(*data, strdup(filename));
+ *data = alpm_list_add(*data, strdup(d->delta));
}
FREE(filepath);
}