Changes to 'refs/tags/spacewalk-backend-1.5.24-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.24-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-19 09:14 +0000
Tagging package [spacewalk-backend] version [1.5.24-1] in directory [backend/].
Changes since spacewalk-java-1.5.31-1:
Julian Einwag (1):
made queries PostgreSQL compatible
Michael Mraka (2):
705002 - made query pg compatible
Automatic commit of package [spacewalk-backend] release [1.5.24-1].
---
backend/server/rhnAction.py | 2
backend/spacewalk-backend.spec | 5 +
rel-eng/packages/spacewalk-backend | 2
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 48 ++++++++++----
4 files changed, 42 insertions(+), 15 deletions(-)
---
12 years, 10 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ecde3e8e76c31d529c9781e677e9c69220d74f86
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 19 11:14:51 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.24-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6724395..732ac6f 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.23
+Version: 1.5.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.24-1
+- 705002 - made query pg compatible
+
* Wed May 18 2011 Miroslav Suchý 1.5.23-1
- do not remove /var/satellite/redhat directory, satellite-sync expect it
- add missing function to pg Cursor
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d441cc6..be7e658 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.23-1 backend/
+1.5.24-1 backend/
12 years, 10 months
web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 48 ++++++++++----
1 file changed, 36 insertions(+), 12 deletions(-)
New commits:
commit 6cc572f6be2a5e861274bce06e266336e0fa8d54
Author: Julian Einwag <je(a)rockenstein.de>
Date: Thu May 19 10:35:53 2011 +0200
made queries PostgreSQL compatible
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index e71117e..59863f3 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -107,6 +107,7 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
<mode name="package_removal_failures">
<query params="sid, action_id">
+select * from (
SELECT PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE,
PC.name || case when PC.version is NULL then ''
else '-' || PC.version end AS NEEDED_CAPABILITY,
@@ -122,12 +123,14 @@ SELECT PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE,
AND APRF.name_id = PN.id
AND APRF.evr_id = PE.id
AND APRF.capability_id = PC.id
-ORDER BY UPPER(PACKAGE)
+) X
+ORDER BY UPPER(X.package)
</query>
</mode>
<mode name="packages_in_errata">
<query params="eid">
+select * from (
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label package_nvre
@@ -141,13 +144,15 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_in_tmp_errata">
<query params="eid">
+select * from (
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label package_nvre
@@ -161,7 +166,8 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
@@ -730,18 +736,21 @@ ORDER BY UPPER (PN.NAME)
<mode name="packages_in_set">
<query params="set_label, user_id">
+select * from (
SELECT PN.id || '|' || PE.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE
FROM rhnPackageName PN, rhnPackageEVR PE, rhnSet S
WHERE S.label = :set_label
AND S.user_id = :user_id
AND S.element = PN.id
AND S.element_two = PE.id
-ORDER BY UPPER(NVRE)
+) X
+ORDER BY UPPER(X.NVRE)
</query>
</mode>
<mode name="package_ids_in_set">
<query params="set_label, user_id">
+select * from (
SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA
FROM rhnPackage P,
rhnPackageName PN,
@@ -754,12 +763,14 @@ ORDER BY UPPER(NVRE)
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(NVREA)
+) X
+ORDER BY UPPER(X.NVREA)
</query>
</mode>
<mode name="patch_ids_in_set">
<query params="set_label, user_id">
+select * from (
SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA,
P.summary, SPT.name as ptype
FROM rhnPackage P,
@@ -777,12 +788,14 @@ ORDER BY UPPER(NVREA)
AND PA.id = P.package_arch_id
AND SP.package_id = P.id
AND SP.patch_type = SPT.id
-ORDER BY UPPER(NVREA)
+) X
+ORDER BY UPPER(X.NVREA)
</query>
</mode>
<mode name="patchset_ids_in_set">
<query params="set_label, user_id">
+select * from (
SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA,
P.summary
FROM rhnPackage P,
@@ -798,12 +811,14 @@ ORDER BY UPPER(NVREA)
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND SP.package_id = P.id
-ORDER BY UPPER(NVREA)
+) X
+ORDER BY UPPER(X.NVREA)
</query>
</mode>
<mode name="packages_owned_by_org">
<query params="org_id">
+select * from (
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label package_nvre
@@ -815,7 +830,8 @@ ORDER BY UPPER(NVREA)
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
@@ -871,6 +887,7 @@ ORDER BY UPPER(PACKAGE_NVRE)
<mode name="packages_available_to_errata_in_channel">
<query params="source_cid, target_eid">
+select * from (
SELECT P.id AS ID,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE_NVRE,
P.summary
@@ -884,13 +901,15 @@ SELECT P.id AS ID,
FROM rhnErrataPackage EP
WHERE EP.errata_id = :target_eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+) X
+ORDER BY UPPER(X.PACKAGE_NVRE)
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_available_to_tmp_errata_in_channel">
<query params="source_cid, target_eid">
+select * from (
SELECT P.id AS ID,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE_NVRE,
P.summary
@@ -904,7 +923,8 @@ SELECT P.id AS ID,
FROM rhnErrataPackagetmp EP
WHERE EP.errata_id = :target_eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+) X
+ORDER BY UPPER(X.PACKAGE_NVRE)
</query>
<elaborator name="package_channels" />
</mode>
@@ -925,6 +945,7 @@ SELECT CP.package_id id, C.name package_channels
<mode name="managed_packages_in_channel">
<query params="channel_id, org_id">
+select * from (
SELECT DISTINCT CP.package_id id, PN.name || '-' || PE.version ||
'-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':'
|| PE.epoch END) || '-' || PA.label package_nvre
@@ -939,13 +960,15 @@ SELECT CP.package_id id, C.name package_channels
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
AND P.org_id = :org_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_in_no_channels_owned_by_org">
<query params="org_id">
+select * from (
SELECT DISTINCT P.id, PN.name || '-' || PE.version || '-' ||
PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' ||
PE.epoch END) || '-' || PA.label package_nvre
@@ -960,7 +983,8 @@ ORDER BY UPPER(package_nvre)
AND NOT EXISTS (SELECT 1
FROM rhnChannelPackage CP
WHERE P.id = CP.package_id)
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
</mode>
12 years, 10 months
backend/server
by Michael Mraka
backend/server/rhnAction.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7d3571ed25b8c9e4b6855e7776ebd72c3faff005
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 18 22:39:40 2011 +0200
705002 - made query pg compatible
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index 62d40f6..7c6cc89 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -40,7 +40,7 @@ def schedule_action(action_type, action_name=None, delta_time=0,
insert into rhnAction
(id, org_id, action_type, name, scheduler, earliest_action, prerequisite)
values (:action_id, :org_id, :action_type_id, :action_name, :scheduler,
- sysdate + :delta / 86400, :prerequisite)
+ current_timestamp + numtodsinterval(:delta, 'second'), :prerequisite)
""")
apply(h.execute, (), params)
12 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.5.31-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.31-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-18 17:21 +0000
Tagging package [spacewalk-java] version [1.5.31-1] in directory [java/].
Changes since spacewalk-backend-1.5.23-1:
Tomas Lestach (2):
659138 - fix message on the schedule create page
Automatic commit of package [spacewalk-java] release [1.5.31-1].
---
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
12 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6633d4589eecee8101c10bffecbc1757445a32a4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 18 19:21:14 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.31-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 40bf1a7..c45a565 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.30
+Version: 1.5.31
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.31-1
+- 659138 - fix message on the schedule create page (tlestach(a)redhat.com)
+
* Tue May 17 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.30-1
- 643905 - make sure hibernate doesn't use cached kickstart trees, but takes
actual DB state (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7240d27..69391f7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.30-1 java/
+1.5.31-1 java/
12 years, 10 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2d5cc2b287032562b4e1ee7fa03ae4ed3c59428d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 18 18:58:28 2011 +0200
659138 - fix message on the schedule create page
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index bcf226e..dab30b4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -18,10 +18,10 @@
<h2><bean:message key="schedule.edit.jsp.basicscheduledetails"/></h2>
<div class="page-summary">
- <c:if test="${active}">
+ <c:if test="${empty param.schid or active}">
<bean:message key="schedule.edit.jsp.introparagraph"/>
</c:if>
- <c:if test="${not active}">
+ <c:if test="${not empty param.schid and not active}">
<bean:message key="schedule.edit.jsp.notactive"/>
</c:if>
</div>
12 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.5.23-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.5.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-18 15:42 +0000
Tagging package [spacewalk-backend] version [1.5.23-1] in directory [backend/].
Changes since spacewalk-java-1.5.30-1:
Miroslav Suchý (5):
fix spelling error
217531 - fix package count
add missing function to pg Cursor
do not remove /var/satellite/redhat directory, satellite-sync expect it
Automatic commit of package [spacewalk-backend] release [1.5.23-1].
---
backend/satellite_tools/satsync.py | 15 ++++++++++-----
backend/satellite_tools/spacewalk-data-fsck | 2 +-
backend/server/rhnSQL/driver_postgresql.py | 3 +++
backend/spacewalk-backend.spec | 11 ++++++++++-
client/tools/rhn-virtualization/rhn-virtualization.spec | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
6 files changed, 26 insertions(+), 9 deletions(-)
---
12 years, 10 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/satellite_tools/spacewalk-data-fsck | 2 +-
backend/spacewalk-backend.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 0693f740ed6a2c530412e10da34a2245158c79bc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 17:42:33 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.23-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index cf7a389..6724395 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.22
+Version: 1.5.23
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,15 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 18 2011 Miroslav Suchý 1.5.23-1
+- do not remove /var/satellite/redhat directory, satellite-sync expect it
+- add missing function to pg Cursor
+- 217531 - fix package count
+- Refactoring of make_evr made MakeEvrError unused, removing.
+- Removal of create_channel_families and create_channels made InvalidEntryError
+ unused, removing.
+- 702684 - made MPM_Header compatible with RPM_Header
+
* Mon May 16 2011 Michael Calmer <mc(a)suse.de> 1.5.22-1
- inherit from DependencyItem like other dep classes (mc(a)suse.de)
- test if checksum_type exists before accessing it (mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3094a45..d441cc6 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.22-1 backend/
+1.5.23-1 backend/
commit 2a8293d2e88ac2406cea8b7a693b01b8c9fdd080
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 17:39:55 2011 +0200
do not remove /var/satellite/redhat directory, satellite-sync expect it
diff --git a/backend/satellite_tools/spacewalk-data-fsck b/backend/satellite_tools/spacewalk-data-fsck
index a8601aa..032b645 100755
--- a/backend/satellite_tools/spacewalk-data-fsck
+++ b/backend/satellite_tools/spacewalk-data-fsck
@@ -215,7 +215,7 @@ def not_in_db(path, options):
log(0, "Removed file missing in db: %s" % (path))
os.unlink(path)
dirname = os.path.dirname(path)
- while dirname != CFG.MOUNT_POINT:
+ while (dirname != CFG.MOUNT_POINT) and (dirname != CFG.MOUNT_POINT+'/'+CFG.PREPENDED_DIR):
try:
os.rmdir(dirname)
except OSError, e:
12 years, 10 months
3 commits - backend/satellite_tools backend/server client/tools
by Miroslav Suchý
backend/satellite_tools/satsync.py | 15 ++++++++++-----
backend/server/rhnSQL/driver_postgresql.py | 3 +++
client/tools/rhn-virtualization/rhn-virtualization.spec | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 4641e2989175549f0e009d0ae1d4b7e6f1435f34
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 15:49:00 2011 +0200
add missing function to pg Cursor
addressing:
Traceback (most recent call last):
File "/usr/bin/spacewalk-data-fsck", line 267, in ?
exit_value += check_db_vs_disk(options)
File "/usr/bin/spacewalk-data-fsck", line 105, in check_db_vs_disk
h.close()
AttributeError: Cursor instance has no attribute 'close'
In Oracle the h has value:
<__builtin__.OracleCursor on <cx_Oracle.Connection to spacewalk@//localhost:1521/XE>>
I'm not really sure if we should do something here, but this should be
enough for now.
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index 0921468..bb8014f 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -314,3 +314,6 @@ class Cursor(sql_base.Cursor):
c = rhnSQL.prepare(sql)
kwargs[column_name] = data
apply(c.execute, (), kwargs)
+
+ def close(self):
+ pass
commit 3fe8370655e9dfcd8741c1ffa3c9f85df5b5519d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 14:17:14 2011 +0200
217531 - fix package count
- do not count package twice
- do not count packages, which already lays on disk
- fix remaining time - you could not multiply timedelta with float, but
we can do timedelta*100*small_number/100
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 1f101cd..7786098 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1731,7 +1731,6 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
#count size of missing packages
for package_id, path in missing_fs_packages:
- pkg_current = pkg_current + 1
timestamp = short_package_collection.get_package_timestamp(package_id)
package = package_collection.get_package(package_id, timestamp)
total_size = total_size+package['package_size']
@@ -1739,7 +1738,8 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
log(1, messages.package_fetch_total_size %
(self._bytes_to_fuzzy(total_size)))
- processed_size = 0
+ real_processed_size = processed_size = 0
+ real_total_size = total_size
start_time = round(time.time())
for package_id, path in missing_fs_packages:
@@ -1765,6 +1765,9 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
checksum_type, checksum)
if errcode == 0:
# file is already there
+ # do not count this size to time estimate
+ real_total_size -= package['package_size']
+ processed_size += package['package_size']
continue
rpmManip = RpmManip(package, path)
@@ -1809,10 +1812,12 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# Determine downloaded size and remaining time
size = package['package_size']
- processed_size = processed_size + size
+ real_processed_size += size
+ processed_size += size
current_time = round(time.time())
- remain_time = (datetime.timedelta(seconds=current_time-start_time))*(total_size/processed_size - 1)
-
+ # 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
+
log(1, messages.package_fetch_remain_size_time %
(self._bytes_to_fuzzy(processed_size), self._bytes_to_fuzzy(total_size), remain_time))
commit 94e937b38ea36e261d619fb44f3f0ef7b09c1aa0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 16:51:41 2011 +0200
fix spelling error
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 9657469..b2d2575 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -3,7 +3,7 @@
%define cron_dir %{_sysconfdir}/cron.d
Name: rhn-virtualization
-Summary: RHN/Spacewalk action support for virualization
+Summary: RHN/Spacewalk action support for virtualization
Group: System Environment/Base
License: GPLv2
12 years, 10 months