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 /lib/libalpm/remove.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 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 132b30c6..5cbeeb96 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -522,6 +522,11 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, int cmp = filehash ? strcmp(filehash, backup->hash) : 0; FREE(filehash); if(cmp != 0) { + alpm_event_pacsave_created_t event = { + .type = ALPM_EVENT_PACSAVE_CREATED, + .oldpkg = oldpkg, + .file = file + }; char *newpath; size_t len = strlen(file) + 8 + 1; MALLOC(newpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); @@ -536,7 +541,7 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, free(newpath); return -1; } - _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); + EVENT(handle, &event); alpm_logaction(handle, ALPM_CALLER_PREFIX, "warning: %s saved as %s\n", file, newpath); free(newpath); |