sync_commit can now return conflicting files with a trans_prepare like data structure (patch from VMiklos <vmiklos@frugalware.org>)

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 819807c6..610c3f64 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -619,7 +619,7 @@ int alpm_trans_prepare(PMList **data)
 	return(trans_prepare(handle->trans, data));
 }
 
-int alpm_trans_commit()
+int alpm_trans_commit(PMList **data)
 {
 	pmtrans_t *trans;
 
@@ -633,7 +633,7 @@ int alpm_trans_commit()
 	/* Check for database R/W permission */
 	ASSERT(handle->access == PM_ACCESS_RW, RET_ERR(PM_ERR_BADPERMS, -1));
 
-	return(trans_commit(handle->trans));
+	return(trans_commit(handle->trans, data));
 }
 
 int alpm_trans_release()