From 1cca4ef764519c00326dc81669b2bbd4bf1b978f Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Mon, 26 May 2008 23:28:34 +0200 Subject: [PATCH] Remove PM_TRANS_EVT_EXTRACT_START. This event was unused, was missing the equivalent EXTRACT_DONE event, and was useless because we already have ADD / UPGRADE START and DONE events. Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/add.c | 1 - lib/libalpm/alpm.h | 2 -- src/pacman/callback.c | 1 - 3 files changed, 4 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index a8249c40..c5454bab 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -806,7 +806,6 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START, alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current); } - EVENT(trans, PM_TRANS_EVT_EXTRACT_DONE, NULL, NULL); /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 4720b222..62a517b4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -334,8 +334,6 @@ typedef enum _pmtransevt_t { * to the callback, respectively. */ PM_TRANS_EVT_UPGRADE_DONE, - /** Package was extracted. */ - PM_TRANS_EVT_EXTRACT_DONE, /** Target package's integrity will be checked. */ PM_TRANS_EVT_INTEGRITY_START, /** Target package's integrity was checked. */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 8a7af5c5..4c415e1a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,7 +226,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) break; /* all the simple done events, with fallthrough for each */ case PM_TRANS_EVT_FILECONFLICTS_DONE: - case PM_TRANS_EVT_EXTRACT_DONE: case PM_TRANS_EVT_CHECKDEPS_DONE: case PM_TRANS_EVT_RESOLVEDEPS_DONE: case PM_TRANS_EVT_INTERCONFLICTS_DONE: