1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00

removed some overlapping pm_errno assignments

This commit is contained in:
Aurelien Foret 2006-01-01 12:42:33 +00:00
parent 55a76279c5
commit 15bc6e5508

View File

@ -593,7 +593,6 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local)
/* remove to-be-replaced packages */ /* remove to-be-replaced packages */
tr = trans_new(); tr = trans_new();
if(tr == NULL) { if(tr == NULL) {
_alpm_log(PM_LOG_ERROR, "could not create removal transaction"); _alpm_log(PM_LOG_ERROR, "could not create removal transaction");
pm_errno = PM_ERR_XXX; 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"); _alpm_log(PM_LOG_FLOW1, "removing to-be-replaced packages");
if(trans_prepare(tr, &data) == -1) { if(trans_prepare(tr, &data) == -1) {
_alpm_log(PM_LOG_ERROR, "could not prepare removal transaction"); _alpm_log(PM_LOG_ERROR, "could not prepare removal transaction");
pm_errno = PM_ERR_XXX;
goto error; goto error;
} }
/* we want the frontend to be aware of commit details */ /* we want the frontend to be aware of commit details */
tr->cb_event = trans->cb_event; tr->cb_event = trans->cb_event;
if(trans_commit(tr) == -1) { if(trans_commit(tr) == -1) {
_alpm_log(PM_LOG_ERROR, "could not commit removal transaction"); _alpm_log(PM_LOG_ERROR, "could not commit removal transaction");
pm_errno = PM_ERR_XXX;
goto error; 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) { 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"); _alpm_log(PM_LOG_ERROR, "could not initialize transaction");
pm_errno = PM_ERR_XXX;
goto error; goto error;
} }
for(i = trans->packages; i; i = i->next) { 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) { if(trans_prepare(tr, &data) == -1) {
_alpm_log(PM_LOG_ERROR, "could not prepare transaction"); _alpm_log(PM_LOG_ERROR, "could not prepare transaction");
pm_errno = PM_ERR_XXX;
goto error; goto error;
} }
/* we want the frontend to be aware of commit details */ /* we want the frontend to be aware of commit details */
tr->cb_event = trans->cb_event; tr->cb_event = trans->cb_event;
if(trans_commit(tr) == -1) { if(trans_commit(tr) == -1) {
_alpm_log(PM_LOG_ERROR, "could not commit transaction"); _alpm_log(PM_LOG_ERROR, "could not commit transaction");
pm_errno = PM_ERR_XXX;
goto error; goto error;
} }
FREETRANS(tr); FREETRANS(tr);