[pacman-dev] [PATCH 13/13] Always pass data to trans_commit()

Dan McGee dan at archlinux.org
Tue Jun 7 17:36:42 EDT 2011


Even though we currently don't use it here in the backend, we might as
well pass it in since we used it earlier.

Signed-off-by: Dan McGee <dan at archlinux.org>
---
 src/pacman/remove.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index 5993ab3..59698e7 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -121,11 +121,11 @@ int pacman_remove(alpm_list_t *targets)
 							depstring);
 					free(depstring);
 				}
-				FREELIST(data);
 				break;
 			default:
 				break;
 		}
+		FREELIST(data);
 		retval = 1;
 		goto cleanup;
 	}
@@ -165,12 +165,14 @@ int pacman_remove(alpm_list_t *targets)
 		goto cleanup;
 	}
 
-	if(alpm_trans_commit(config->handle, NULL) == -1) {
+	if(alpm_trans_commit(config->handle, &data) == -1) {
 		pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"),
 		        alpm_strerror(alpm_errno(config->handle)));
 		retval = 1;
 	}
 
+	FREELIST(data);
+
 	/* Step 4: release transaction resources */
 cleanup:
 	if(trans_release() == -1) {
-- 
1.7.5.2



More information about the pacman-dev mailing list