client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit cb136c947665fb7aa278a3de42a6e5b9cd1f4f6e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu May 13 12:26:10 2010 +0200
557059 - we cannot have class None.
Addressing
[Thu May 13 06:18:39 2010] rhn_register D: rpcServer: Calling XMLRPC
registration.add_hw_profile
[Thu May 13 06:18:39 2010] rhn_register
Traceback (most recent call last):
File "/usr/share/rhn/up2date_client/tui.py", line 891, in run
rhnreg.sendHardware(systemId, self.tui.hardware)
File "/usr/share/rhn/up2date_client/rhnreg.py", line 472, in sendHardware
s.registration.add_hw_profile(systemId, hardwareList)
File "/usr/share/rhn/up2date_client/rhnserver.py", line 50, in __call__
return rpcServer.doCall(method, *args, **kwargs)
File "/usr/share/rhn/up2date_client/rpcServer.py", line 204, in doCall
ret = method(*args, **kwargs)
File "/usr/lib64/python2.6/xmlrpclib.py", line 1199, in __call__
return self.__send(self.__name, args)
File "/usr/share/rhn/up2date_client/rpcServer.py", line 39, in _request1
ret = self._request(methodname, params)
File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 350, in
_request
request = self._req_body(params, methodname)
File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 231, in
_req_body
return xmlrpclib.dumps(params, methodname, encoding=self._encoding)
File "/usr/lib64/python2.6/xmlrpclib.py", line 1132, in dumps
data = m.dumps(params)
File "/usr/lib64/python2.6/xmlrpclib.py", line 677, in dumps
dump(v, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 699, in __dump
f(self, value, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 759, in dump_array
dump(v, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 699, in __dump
f(self, value, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 780, in dump_struct
dump(v, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 699, in __dump
f(self, value, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 703, in dump_nil
raise TypeError, "cannot marshal None unless allow_none is enabled"
<type 'exceptions.TypeError'>: cannot marshal None unless allow_none is
enabled
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
index 4c07373..040f6af 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
@@ -45,6 +45,8 @@ def get_devices():
'class': _clasify_class(device),
'desc': _get_device_desc(device),
}
+ if result_item['class'] is None:
+ result_item['class'] = 'OTHER'
if result_item['driver'] is None:
result_item['driver'] = 'unknown'
if subsystem == 'block':