diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 18:42:44 +0000 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 18:42:44 +0000 |
| commit | 86e5c8bc0649a6df814bdff850a787826612f366 (patch) | |
| tree | 0c81099af96848c8c87f6a305fea2f64cd0e020d /lib/libalpm/alpm.c | |
| parent | e405204915600340180cef61471471929fb0c275 (diff) | |
| download | pacman-86e5c8bc0649a6df814bdff850a787826612f366.tar.xz | |
sync_commit can now return conflicting files with a trans_prepare like data structure (patch from VMiklos <vmiklos@frugalware.org>)
Diffstat (limited to 'lib/libalpm/alpm.c')
| -rw-r--r-- | lib/libalpm/alpm.c | 4 |
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() |