diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 19:42:44 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 19:42:44 +0100 |
| commit | 86e5c8bc0649a6df814bdff850a787826612f366 (patch) | |
| tree | 0c81099af96848c8c87f6a305fea2f64cd0e020d /lib/libalpm/trans.c | |
| parent | e405204915600340180cef61471471929fb0c275 (diff) | |
| download | pacman-86e5c8bc0649a6df814bdff850a787826612f366.tar.gz 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/trans.c')
| -rw-r--r-- | lib/libalpm/trans.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |