diff options
| author | Olivier Brunel <jjk@jjacky.com> | 2014-01-10 16:25:13 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-01-28 20:10:49 +1000 |
| commit | 4e9d88aa05184e29368f1602b9fcb6a05d293095 (patch) | |
| tree | e5d3de423bdbce560ce70b03fc408781f26eca69 | |
| parent | e65a752475797eb3e917858190a2679e9cd680b9 (diff) | |
| download | pacman-4e9d88aa05184e29368f1602b9fcb6a05d293095.tar.xz | |
Rename ALPM_EVENT_OPTDEP_REQUIRED to _OPTDEP_REMOVAL
Because this event is triggered when an optdepend for another package is
being removed.
Signed-off-by: Olivier Brunel <jjk@jjacky.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/alpm.h | 2 | ||||
| -rw-r--r-- | lib/libalpm/remove.c | 2 | ||||
| -rw-r--r-- | src/pacman/callback.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 5628527d..126f50a5 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -377,7 +377,7 @@ typedef enum _alpm_event_t { ALPM_EVENT_DISKSPACE_DONE, /** An optdepend for another package is being removed * The requiring package and its dependency are passed to the callback */ - ALPM_EVENT_OPTDEP_REQUIRED, + ALPM_EVENT_OPTDEP_REMOVAL, /** A configured repository database is missing */ ALPM_EVENT_DATABASE_MISSING, /** Checking keys used to create signatures are in keyring. */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 899952b7..d78c5f1f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -179,7 +179,7 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; if(alpm_pkg_find(lp, optdep->name)) { - EVENT(handle, ALPM_EVENT_OPTDEP_REQUIRED, pkg, optdep); + EVENT(handle, ALPM_EVENT_OPTDEP_REMOVAL, pkg, optdep); } } } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 8c0fab55..4b0f881a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -247,7 +247,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("checking available disk space...\n")); } break; - case ALPM_EVENT_OPTDEP_REQUIRED: + case ALPM_EVENT_OPTDEP_REMOVAL: colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1), alpm_dep_compute_string(data2)); break; |