To go along with RETRIEVE_START, one other event will be emmitted once
the downloads are done: RETRIEVE_DONE if all files were successfully
downloaded, else RETRIEVE_FAILED.
Signed-off-by: Olivier Brunel
---
lib/libalpm/alpm.h | 4 ++++
lib/libalpm/sync.c | 3 +++
src/pacman/callback.c | 2 ++
3 files changed, 9 insertions(+)
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 2f8d6d5..a61a712 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -318,6 +318,10 @@ typedef enum _alpm_event_type_t {
ALPM_EVENT_SCRIPTLET_INFO,
/** Files will be downloaded from a repository. */
ALPM_EVENT_RETRIEVE_START,
+ /** Files were downloaded from a repository. */
+ ALPM_EVENT_RETRIEVE_DONE,
+ /** Not all files were successfully downloaded from a repository. */
+ ALPM_EVENT_RETRIEVE_FAILED,
/** Disk space usage will be computed for a package. */
ALPM_EVENT_DISKSPACE_START,
/** Disk space usage was computed for a package. */
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index c79000c..8046ce5 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -974,12 +974,15 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas)
event.type = ALPM_EVENT_RETRIEVE_START;
EVENT(handle, &event);
+ event.type = ALPM_EVENT_RETRIEVE_DONE;
for(i = files; i; i = i->next) {
if(download_single_file(handle, i->data, cachedir) == -1) {
errors++;
+ event.type = ALPM_EVENT_RETRIEVE_FAILED;
_alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n"));
}
}
+ EVENT(handle, &event);
}
finish:
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index c881b69..e4517f8 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -348,6 +348,8 @@ void cb_event(alpm_event_t *event)
case ALPM_EVENT_DELTA_INTEGRITY_DONE:
case ALPM_EVENT_DELTA_PATCHES_DONE:
case ALPM_EVENT_DISKSPACE_DONE:
+ case ALPM_EVENT_RETRIEVE_DONE:
+ case ALPM_EVENT_RETRIEVE_FAILED:
/* nothing */
break;
}
--
1.8.4.2