diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2005-05-04 21:55:23 +0200 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2005-05-04 21:55:23 +0200 |
| commit | a26095f8fc27eb564fd5b49c0d99e7821c21e2e8 (patch) | |
| tree | e9491a2171abd4414e4a2b59ebdaec6edb85e59c /lib/libalpm/remove.c | |
| parent | 14c8583ccbb9f3ff218611ca3d54d93b394b41b5 (diff) | |
| download | pacman-a26095f8fc27eb564fd5b49c0d99e7821c21e2e8.tar.gz pacman-a26095f8fc27eb564fd5b49c0d99e7821c21e2e8.tar.xz | |
event transaction callback rework to prepare the introduction of a conversation callback
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 38dfb299..181f4ddd 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -81,7 +81,7 @@ int remove_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data) ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); if(!(trans->flags & (PM_TRANS_FLAG_NODEPS)) && (trans->type != PM_TRANS_TYPE_UPGRADE)) { - TRANS_CB(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL); + EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL); _alpm_log(PM_LOG_FLOW1, "looking for unsatisfied dependencies"); if((lp = checkdeps(db, trans->type, trans->packages)) != NULL) { @@ -119,7 +119,7 @@ int remove_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data) FREELISTPTR(trans->packages); trans->packages = lp; - TRANS_CB(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL); + EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL); } return(0); @@ -147,7 +147,7 @@ int remove_commit(pmtrans_t *trans, pmdb_t *db) info = (pmpkg_t*)targ->data; if(trans->type != PM_TRANS_TYPE_UPGRADE) { - TRANS_CB(trans, PM_TRANS_EVT_REMOVE_START, info, NULL); + EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL); _alpm_log(PM_LOG_FLOW1, "removing package %s-%s", info->name, info->version); /* run the pre-remove scriptlet if it exists */ @@ -273,7 +273,7 @@ int remove_commit(pmtrans_t *trans, pmdb_t *db) } if(trans->type != PM_TRANS_TYPE_UPGRADE) { - TRANS_CB(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL); + EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL); alpm_logaction("removed %s (%s)", info->name, info->version); } } |