backend/satellite_tools/satsync.py | 5 +++--
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 89f60e9b6d6fd93ce1ca3dd0daab56b9c0afd561
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 22 11:29:54 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.36-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6415c1b..8207238 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.35
+Version: 1.5.36
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Jun 22 2011 Miroslav Suchý 1.5.36-1
+- in sat-sync ETA cut off miliseconds (msuchy(a)redhat.com)
+- make sat-sync ETA more precise (msuchy(a)redhat.com)
+
* Tue Jun 21 2011 Jan Pazdziora 1.5.35-1
- 676937 - allow to export all channels (msuchy(a)redhat.com)
- export from hosted does not know soft dependecies (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 7ddcb68..bb799ce 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.35-1 backend/
+1.5.36-1 backend/
commit 2de825e0c3e6a525bcc539a31e1be862535f2c39
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 22 11:28:54 2011 +0200
in sat-sync ETA cut off miliseconds
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index fcd4d3d..7eda16d 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1780,6 +1780,8 @@ Please contact your RHN representative""") %
(generation, sat_cert.generation))
current_time = round(time.time())
# timedalta could not be multiplicated by float
remain_time =
(datetime.timedelta(seconds=current_time-start_time))*((real_total_size*10000)/real_processed_size-10000)/10000
+ # cut off miliseconds
+ remain_time = datetime.timedelta(remain_time.days, remain_time.seconds)
log(1, messages.package_fetch_remain_size_time %
(self._bytes_to_fuzzy(processed_size), self._bytes_to_fuzzy(total_size),
remain_time))
commit bef078151d3432dc6a89c521627933cc5f2cdb04
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 22 11:26:49 2011 +0200
make sat-sync ETA more precise
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index f58c77e..fcd4d3d 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1779,8 +1779,7 @@ Please contact your RHN representative""") %
(generation, sat_cert.generation))
processed_size += size
current_time = round(time.time())
# timedalta could not be multiplicated by float
- remain_time =
(datetime.timedelta(seconds=current_time-start_time))*((real_total_size*100)/real_processed_size-100)/100
-
+ remain_time =
(datetime.timedelta(seconds=current_time-start_time))*((real_total_size*10000)/real_processed_size-10000)/10000
log(1, messages.package_fetch_remain_size_time %
(self._bytes_to_fuzzy(processed_size), self._bytes_to_fuzzy(total_size),
remain_time))