summaryrefslogtreecommitdiffstats
path: root/src/pacman/add.c
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-01-07 19:42:44 +0100
committerAurelien Foret <aurelien@archlinux.org>2006-01-07 19:42:44 +0100
commit86e5c8bc0649a6df814bdff850a787826612f366 (patch)
tree0c81099af96848c8c87f6a305fea2f64cd0e020d /src/pacman/add.c
parente405204915600340180cef61471471929fb0c275 (diff)
downloadpacman-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 'src/pacman/add.c')
-rw-r--r--src/pacman/add.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pacman/add.c b/src/pacman/add.c
index fb6c4a58..10c618eb 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -122,7 +122,7 @@ int pacman_add(list_t *targets)
/* Step 3: actually perform the installation
*/
- if(alpm_trans_commit() == -1) {
+ if(alpm_trans_commit(NULL) == -1) {
ERR(NL, "failed to commit transaction (%s)\n", alpm_strerror(pm_errno));
return(1);
}