backend/server/rhnServer/server_packages.py | 3 ++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit b77fa3f9f410223616f8c0e2b9358f82ea68637b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Dec 1 11:54:47 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.18-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5a26583..3ec93e9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.17
+Version: 0.7.18
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Dec 1 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.18-1
+- 449167 - time.strptime can not handle None values
+
* Thu Nov 26 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.17-1
- fix compilation error
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 5ae6e79..456a29d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.17-1 backend/
+0.7.18-1 backend/
commit 34c1aab76cde52d15ee7332b8752acaf4b3fe12b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Dec 1 11:19:26 2009 +0100
449167 - time.strptime can not handle None values
addresing:
Traceback (most recent call last):
File "/usr/share/rhn/server/apacheRequest.py", line 120, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 957, in
update_packages
server.dispose_packages()
File "/usr/share/rhn/server/rhnServer/server_wrapper.py", line 68, in
dispose_packages
return Packages.dispose_packages(self, self.server["id"])
File "/usr/share/rhn/server/rhnServer/server_packages.py", line 119, in
dispose_packages
self.reload_packages_byid(sysid)
File "/usr/share/rhn/server/rhnServer/server_packages.py", line 258, in
reload_packages_byid
"%Y-%m-%d %H:%M:%S"))
File "/usr/lib/python2.4/_strptime.py", line 291, in strptime
found = format_regex.match(data_string)
TypeError: expected string or buffer
diff --git a/backend/server/rhnServer/server_packages.py
b/backend/server/rhnServer/server_packages.py
index 01afa33..d3eac96 100644
--- a/backend/server/rhnServer/server_packages.py
+++ b/backend/server/rhnServer/server_packages.py
@@ -252,7 +252,8 @@ class Packages:
if not t:
break
t['arch'] = package_arches_hash[t['package_arch_id']]
- t['installtime'] =
time.mktime(time.strptime(t['installtime'],
+ if t.has_key('installtime') and t['installtime'] is not
None:
+ t['installtime'] =
time.mktime(time.strptime(t['installtime'],
"%Y-%m-%d %H:%M:%S"))
p = dbPackage(t, real=1, name_id=t['name_id'],
evr_id=t['evr_id'],
package_arch_id=t['package_arch_id'])