diff options
| author | Olivier Brunel <jjk@jjacky.com> | 2014-02-12 16:32:30 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-03-03 02:25:55 +0100 |
| commit | cfaff6e0c14d29f07246386695bce0188ce6f44b (patch) | |
| tree | 18e660b42b884b09b01238d200fb9c432a552700 /src/pacman/callback.c | |
| parent | 894773eb5bb054ba9750d9be269814c7e6672766 (diff) | |
| download | pacman-cfaff6e0c14d29f07246386695bce0188ce6f44b.tar.gz pacman-cfaff6e0c14d29f07246386695bce0188ce6f44b.tar.xz | |
Add events on pacnew/pacsave/pacorig file creation
ALPM still adds a warning to the log, but doesn't emit an event about
said warning, instead using a specific event to let the frontend what
happened/how to inform the user.
Note that there are 2 cases for installing a .pacnew file, to not
overwrite user changes and because file is in NoUpgrade. In the later case
the warning was a bit different: it happened before and said "extracting"
instead of "installed." Now both happen after and are phrased the same.
Signed-off-by: Olivier Brunel <jjk@jjacky.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/pacman/callback.c')
| -rw-r--r-- | src/pacman/callback.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 2540b73c..340a3a1c 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -288,6 +288,54 @@ void cb_event(alpm_event_t *event) } } break; + case ALPM_EVENT_PACNEW_CREATED: + { + alpm_event_pacnew_created_t *e = (alpm_event_pacnew_created_t *) event; + if(on_progress) { + char *string = NULL; + pm_sprintf(&string, ALPM_LOG_WARNING, _("%s installed as %s.pacnew\n"), + e->file, e->file); + if(string != NULL) { + output = alpm_list_add(output, string); + } + } else { + pm_printf(ALPM_LOG_WARNING, _("%s installed as %s.pacnew\n"), + e->file, e->file); + } + } + break; + case ALPM_EVENT_PACSAVE_CREATED: + { + alpm_event_pacsave_created_t *e = (alpm_event_pacsave_created_t *) event; + if(on_progress) { + char *string = NULL; + pm_sprintf(&string, ALPM_LOG_WARNING, _("%s saved as %s.pacsave\n"), + e->file, e->file); + if(string != NULL) { + output = alpm_list_add(output, string); + } + } else { + pm_printf(ALPM_LOG_WARNING, _("%s saved as %s.pacsave\n"), + e->file, e->file); + } + } + break; + case ALPM_EVENT_PACORIG_CREATED: + { + alpm_event_pacorig_created_t *e = (alpm_event_pacorig_created_t *) event; + if(on_progress) { + char *string = NULL; + pm_sprintf(&string, ALPM_LOG_WARNING, _("%s saved as %s.pacorig\n"), + e->file, e->file); + if(string != NULL) { + output = alpm_list_add(output, string); + } + } else { + pm_printf(ALPM_LOG_WARNING, _("%s saved as %s.pacorig\n"), + e->file, e->file); + } + } + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: |