From 86e5c8bc0649a6df814bdff850a787826612f366 Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Sat, 7 Jan 2006 18:42:44 +0000 Subject: sync_commit can now return conflicting files with a trans_prepare like data structure (patch from VMiklos ) --- lib/libalpm/trans.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libalpm/trans.c') diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 8830a1ec..12441f01 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -179,7 +179,7 @@ int trans_prepare(pmtrans_t *trans, PMList **data) return(0); } -int trans_commit(pmtrans_t *trans) +int trans_commit(pmtrans_t *trans, PMList **data) { /* Sanity checks */ ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); @@ -204,7 +204,7 @@ int trans_commit(pmtrans_t *trans) } break; case PM_TRANS_TYPE_SYNC: - if(sync_commit(trans, handle->db_local) == -1) { + if(sync_commit(trans, handle->db_local, data) == -1) { /* pm_errno is set by sync_commit() */ return(-1); } -- cgit v1.2.3-24-g4f1b