summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Brunel <jjk@jjacky.com>2014-01-10 16:25:16 +0100
committerAllan McRae <allan@archlinux.org>2014-03-03 02:25:54 +0100
commit01cc55a1f47c99d3f296e710904b5f3fc31e0b1d (patch)
tree2e7336fe68a057544c4deb817460369de9eb0c60
parentcd793c5ab7689cc8cbc18277375b368060e5acfe (diff)
downloadpacman-01cc55a1f47c99d3f296e710904b5f3fc31e0b1d.tar.gz
pacman-01cc55a1f47c99d3f296e710904b5f3fc31e0b1d.tar.xz
Add events ALPM_EVENT_RETRIEVE_{DONE, FAILED}
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 <jjk@jjacky.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/alpm.h4
-rw-r--r--lib/libalpm/sync.c3
-rw-r--r--src/pacman/callback.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 4aa092d0..b129ff9b 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 076935d1..68c33243 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -977,12 +977,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 cd77a312..f512a5b4 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -300,6 +300,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;
}