moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Rename ALPM_EVENT_OPTDEP_REQUIRED to _OPTDEP_REMOVAL

Browse Source 
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>
This commit is contained in:
Olivier Brunel 2014-01-10 16:25:13 +01:00 committed by Allan McRae
parent e65a752475
commit 4e9d88aa05
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/alpm.h
View File

@ -377,7 +377,7 @@ typedef enum _alpm_event_t {
ALPM_EVENT_DISKSPACE_DONE, ALPM_EVENT_DISKSPACE_DONE,
/** An optdepend for another package is being removed /** An optdepend for another package is being removed
* The requiring package and its dependency are passed to the callback */ * 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 */ /** A configured repository database is missing */
ALPM_EVENT_DATABASE_MISSING, ALPM_EVENT_DATABASE_MISSING,
/** Checking keys used to create signatures are in keyring. */ /** Checking keys used to create signatures are in keyring. */

2
lib/libalpm/remove.c
View File

@ -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)) { for(j = optdeps; j; j = alpm_list_next(j)) {
alpm_depend_t *optdep = j->data; alpm_depend_t *optdep = j->data;
if(alpm_pkg_find(lp, optdep->name)) { if(alpm_pkg_find(lp, optdep->name)) {
EVENT(handle, ALPM_EVENT_OPTDEP_REQUIRED, pkg, optdep); EVENT(handle, ALPM_EVENT_OPTDEP_REMOVAL, pkg, optdep);
} }
} }
} }

2
src/pacman/callback.c
View File

@ -247,7 +247,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
printf(_("checking available disk space...\n")); printf(_("checking available disk space...\n"));
} }
break; break;
case ALPM_EVENT_OPTDEP_REQUIRED: case ALPM_EVENT_OPTDEP_REMOVAL:
colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1), colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1),
alpm_dep_compute_string(data2)); alpm_dep_compute_string(data2));
break; break;