client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++- client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2 ++ rel-eng/packages/rhn-client-tools | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit dc9fc7458f6d84227514fd3ad6f12ce6c7783a84 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Oct 7 12:30:05 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.22-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 543ab7b..638800e 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 1.6.21 +Version: 1.6.22 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test %endif
%changelog +* Fri Oct 07 2011 Miroslav Suchý 1.6.22-1 +- 743259 - if IPv6 is not present, send empty string instead of None + * Thu Oct 06 2011 Miroslav Suchý 1.6.21-1 - 743259 - send IPv6 addresses only if server support it
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 3c06c82..1e79006 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -1.6.21-1 client/rhel/rhn-client-tools/ +1.6.22-1 client/rhel/rhn-client-tools/
commit 181e93e077b831d6f6b425898444906b96488cb1 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Oct 7 12:25:39 2011 +0200
743259 - if IPv6 is not present, send empty string instead of None
Addressing: Traceback (most recent call last): File "/usr/sbin/rhn-profile-sync", line 56, in <module> cli.run() File "/usr/share/rhn/up2date_client/rhncli.py", line 74, in run sys.exit(self.main() or 0) File "/usr/sbin/rhn-profile-sync", line 47, in main rhnHardware.updateHardware() File "/usr/share/rhn/up2date_client/rhnHardware.py", line 12, in updateHardware hardwareList) 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 37, in _request1 ret = self._request(methodname, params) File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 377, in _request request = self._req_body(self._strip_characters(params), methodname) File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 232, 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.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py index cc20e7b..0effffb 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py @@ -516,6 +516,8 @@ def read_network():
if netdict['ipaddr'] is None: netdict['ipaddr'] = '' + if netdict['ip6addr'] is None: + netdict['ip6addr'] = '' return netdict
def read_network_interfaces():
spacewalk-commits@lists.fedorahosted.org