- don't print like crazy (#236981), backported from upstream CVS
This commit is contained in:
parent
40373e1494
commit
01c1656558
46
curl-7.16.2-print.patch
Normal file
46
curl-7.16.2-print.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
===================================================================
|
||||||
|
RCS file: /cvsroot/curl/curl/lib/progress.c,v
|
||||||
|
retrieving revision 1.83
|
||||||
|
retrieving revision 1.84
|
||||||
|
diff -u -r1.83 -r1.84
|
||||||
|
--- curl/lib/progress.c 2007/03/23 04:23:53 1.83
|
||||||
|
+++ curl/lib/progress.c 2007/04/18 20:02:41 1.84
|
||||||
|
@@ -245,6 +245,7 @@
|
||||||
|
long ulestimate=0;
|
||||||
|
long dlestimate=0;
|
||||||
|
long total_estimate;
|
||||||
|
+ bool shownow=FALSE;
|
||||||
|
|
||||||
|
now = Curl_tvnow(); /* what time is it */
|
||||||
|
|
||||||
|
@@ -266,6 +267,7 @@
|
||||||
|
|
||||||
|
/* Calculations done at most once a second, unless end is reached */
|
||||||
|
if(data->progress.lastshow != (long)now.tv_sec) {
|
||||||
|
+ shownow = TRUE;
|
||||||
|
|
||||||
|
data->progress.lastshow = now.tv_sec;
|
||||||
|
|
||||||
|
@@ -346,7 +348,12 @@
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* If there's no external callback set, use internal code to show progress */
|
||||||
|
+ if(!shownow)
|
||||||
|
+ /* only show the internal progress meter once per second */
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ /* If there's no external callback set, use internal code to show
|
||||||
|
+ progress */
|
||||||
|
|
||||||
|
if(!(data->progress.flags & PGRS_HEADERS_OUT)) {
|
||||||
|
if(data->reqdata.resume_from) {
|
||||||
|
@@ -422,7 +429,7 @@
|
||||||
|
/* we flush the output stream to make it appear as soon as possible */
|
||||||
|
fflush(data->set.err);
|
||||||
|
|
||||||
|
- }
|
||||||
|
+ } /* !(data->progress.flags & PGRS_HIDE) */
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
@ -4,12 +4,13 @@
|
|||||||
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
||||||
Name: curl
|
Name: curl
|
||||||
Version: 7.16.2
|
Version: 7.16.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
|
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
|
||||||
Patch1: curl-7.15.3-multilib.patch
|
Patch1: curl-7.15.3-multilib.patch
|
||||||
Patch2: curl-7.16.0-privlibs.patch
|
Patch2: curl-7.16.0-privlibs.patch
|
||||||
|
Patch3: curl-7.16.2-print.patch
|
||||||
URL: http://curl.haxx.se/
|
URL: http://curl.haxx.se/
|
||||||
Requires: openssl
|
Requires: openssl
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -38,6 +39,7 @@ use cURL's capabilities internally.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1 -b .multilib
|
%patch1 -p1 -b .multilib
|
||||||
%patch2 -p1 -b .privlibs
|
%patch2 -p1 -b .privlibs
|
||||||
|
%patch3 -p1 -b .print
|
||||||
|
|
||||||
%build
|
%build
|
||||||
aclocal
|
aclocal
|
||||||
@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/aclocal/libcurl.m4
|
%{_datadir}/aclocal/libcurl.m4
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 18 2007 Jindrich Novy <jnovy@redhat.com> 7.16.2-5
|
||||||
|
- don't print like crazy (#236981), backported from upstream CVS
|
||||||
|
|
||||||
* Fri Jun 15 2007 Jindrich Novy <jnovy@redhat.com> 7.16.2-4
|
* Fri Jun 15 2007 Jindrich Novy <jnovy@redhat.com> 7.16.2-4
|
||||||
- another series of review fixes (#225671),
|
- another series of review fixes (#225671),
|
||||||
thanks to Paul Horwath
|
thanks to Paul Horwath
|
||||||
|
Loading…
Reference in New Issue
Block a user