backend/satellite_tools/messages.py | 4 ++--
backend/satellite_tools/satsync.py | 10 +++++-----
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 58993fac77440eb3dadb3d835df9e6960b0b8841
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 18 16:06:24 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.11-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ac4d3d6..f5b145a 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.6.10
+Version: 1.6.11
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -672,6 +672,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Aug 18 2011 Miroslav Suchý 1.6.11-1
+- 723856 - remove unused variable
+- if we use 1024 as base, we should use kiB, MiB, GiB
+- 731692 - correct output of number beyond decimal point in sat-sync
+
* Thu Aug 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.10-1
- 658533 - remove default currency from backend part of rhn.conf
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 75cd5c0..0c411a1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.10-1 backend/
+1.6.11-1 backend/
commit 1df106a56a98959b2b3fbb65fb9774115c85781c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 18 15:42:24 2011 +0200
723856 - remove unused variable
after moving code to Threading class, get number of current is much harder
and we really do not need it -> purge
diff --git a/backend/satellite_tools/messages.py b/backend/satellite_tools/messages.py
index a8fe7e8..ea5ca0d 100644
--- a/backend/satellite_tools/messages.py
+++ b/backend/satellite_tools/messages.py
@@ -64,10 +64,10 @@ Please contact your sales rep or RHN contact
not_enough_diskspace = _(" ERROR: not enough free space (%s KB) on device.")
package_fetch_successful = _(" %3d/%s Fetch successful: %s (%s bytes)")
-package_fetch_extinct = _(" %3d/%s Extinct package: %s")
+package_fetch_extinct = _(" Extinct package: %s")
package_fetch_total_size = _(" Total size: %s")
package_fetch_remain_size_time = _(" Downloaded %s of %s. Estimated remaining
time: %s")
-package_fetch_failed = _(" %3d/%s Fetch unsuccessful: %s")
+package_fetch_failed = _(" Fetch unsuccessful: %s")
package_fetch_summary = _(" RPM fetch summary: %s")
package_fetch_summary_success = _(" success: %d")
package_fetch_summary_failed = _(" failed: %d")
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 326ce30..cfc57f6 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1908,7 +1908,7 @@ class ThreadDownload(threading.Thread):
# Mark the package as extinct
self.extinct_packages.put(package_id)
log(1, messages.package_fetch_extinct %
- (pkg_current, pkgs_total, os.path.basename(path)))
+ (os.path.basename(path)))
break # inner for
try:
@@ -1926,7 +1926,7 @@ class ThreadDownload(threading.Thread):
# Mark the package as failed and move on
self.failed_fs_packages.put(package_id)
log(1, messages.package_fetch_failed %
- (pkg_current, pkgs_total, os.path.basename(path)))
+ (os.path.basename(path)))
# Move to the next package
try:
self.queue.task_done()
commit 061d90567aadd89541764ac8a97068e893113c81
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 18 16:02:39 2011 +0200
if we use 1024 as base, we should use kiB, MiB, GiB
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index ad33def..326ce30 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1812,13 +1812,13 @@ Please contact your RHN representative""") %
(generation, sat_cert.generation))
if (bytes/kilo == 0):
return "%d bytes" %(bytes)
elif (bytes/mega == 0):
- return "%d kB" %(bytes / 1024)
+ return "%d kiB" %(bytes / 1024)
elif (bytes/giga == 0):
mega_value=bytes / mega
- return "%d.%03d MB" %(mega_value, (bytes % mega) / kilo)
+ return "%d.%03d MiB" %(mega_value, (bytes % mega) / kilo)
else:
giga_value=bytes / giga
- return "%d.%03d GB" %(giga_value, (bytes % giga) / mega)
+ return "%d.%03d GiB" %(giga_value, (bytes % giga) / mega)
def _get_package_stream(self, channel, package_id, nvrea, sources):
""" returns (filepath, stream), so in the case of a "wire
source",
commit b59ac75ba462262a33e18a63d1486ef56376af89
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 18 16:00:26 2011 +0200
731692 - correct output of number beyond decimal point in sat-sync
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index d6ba3a7..ad33def 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1815,10 +1815,10 @@ Please contact your RHN representative""") %
(generation, sat_cert.generation))
return "%d kB" %(bytes / 1024)
elif (bytes/giga == 0):
mega_value=bytes / mega
- return "%d.%d MB" %(mega_value, (bytes % mega) / kilo)
+ return "%d.%03d MB" %(mega_value, (bytes % mega) / kilo)
else:
giga_value=bytes / giga
- return "%d.%d GB" %(giga_value, (bytes % giga) / mega)
+ return "%d.%03d GB" %(giga_value, (bytes % giga) / mega)
def _get_package_stream(self, channel, package_id, nvrea, sources):
""" returns (filepath, stream), so in the case of a "wire
source",