Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=42f2b0730de06dee56d92e69e040cf4306757845

commit 42f2b0730de06dee56d92e69e040cf4306757845
Author: Michel Hermier <[email protected]>
Date:   Fri Nov 29 01:04:58 2013 +0100

libpacman: Avoid some curl, spurus events in download cb.

diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index 00a334c..239fa4b 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -150,6 +150,10 @@ int _pacman_curl_progresscb(void *clientp, double dltotal, 
double dlnow, double
struct timeval now;
double time_delta;

+               if(download->dst_tell == download->dst_resume + dlnow) {
+                       /* Avoid spurus events from curl */
+                       return 0;
+               }
gettimeofday(&now, NULL);
download->dst_tell = download->dst_resume + dlnow;
download->dst_size = download->dst_resume + dltotal;
@@ -227,6 +231,7 @@ pmdownloadsuccess_t 
_pacman_curl_download(pmcurldownloader_t *curldownloader, co
pmdownloadsuccess_t ret = PM_DOWNLOAD_OK;

curldownloader->download.dst_resume = 0;
+       curldownloader->download.dst_tell = -1; // To not miss potential curl 
event at 0.
gettimeofday(&curldownloader->download.dst_begin, NULL);
curldownloader->previous_update = curldownloader->download.dst_begin;
if(pm_dlt) {
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to