From 15bc6e5508cf8e083f161f353ba12a9af4a89c56 Mon Sep 17 00:00:00 2001
From: Aurelien Foret <aurelien@archlinux.org>
Date: Sun, 1 Jan 2006 12:42:33 +0000
Subject: removed some overlapping pm_errno assignments
---
lib/libalpm/sync.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 9facd95f..f1e04eec 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -593,7 +593,6 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local)
/* remove to-be-replaced packages */
tr = trans_new();
-
if(tr == NULL) {
_alpm_log(PM_LOG_ERROR, "could not create removal transaction");
pm_errno = PM_ERR_XXX;
@@ -622,14 +621,12 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local)
_alpm_log(PM_LOG_FLOW1, "removing to-be-replaced packages");
if(trans_prepare(tr, &data) == -1) {
_alpm_log(PM_LOG_ERROR, "could not prepare removal transaction");
- pm_errno = PM_ERR_XXX;
goto error;
}
/* we want the frontend to be aware of commit details */
tr->cb_event = trans->cb_event;
if(trans_commit(tr) == -1) {
_alpm_log(PM_LOG_ERROR, "could not commit removal transaction");
- pm_errno = PM_ERR_XXX;
goto error;
}
}
@@ -645,7 +642,6 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local)
}
if(trans_init(tr, PM_TRANS_TYPE_UPGRADE, trans->flags | PM_TRANS_FLAG_NODEPS, NULL, NULL) == -1) {
_alpm_log(PM_LOG_ERROR, "could not initialize transaction");
- pm_errno = PM_ERR_XXX;
goto error;
}
for(i = trans->packages; i; i = i->next) {
@@ -669,14 +665,12 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local)
}
if(trans_prepare(tr, &data) == -1) {
_alpm_log(PM_LOG_ERROR, "could not prepare transaction");
- pm_errno = PM_ERR_XXX;
goto error;
}
/* we want the frontend to be aware of commit details */
tr->cb_event = trans->cb_event;
if(trans_commit(tr) == -1) {
_alpm_log(PM_LOG_ERROR, "could not commit transaction");
- pm_errno = PM_ERR_XXX;
goto error;
}
FREETRANS(tr);
--
cgit v1.2.3-54-g00ecf