client/rhel/rhn-client-tools/rhn-client-tools.spec | 9 ++++++++-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 5 +++--
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 1703a993f3fb2cbbb5a8439684b3b8f156cf3b21
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Dec 3 11:34:35 2010 +0100
Automatic commit of package [rhn-client-tools] release [1.3.2-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 3e8668a..fb9496e 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/%{name}-%{version}.tar.gz
URL:
https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -290,6 +290,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Fri Dec 03 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.2-1
+- on el5 do not send IPv6 addresses (msuchy(a)redhat.com)
+
* Sat Nov 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.1-1
- 655310 - replace gethostbyname by getaddrinfo (msuchy(a)redhat.com)
- 655310 - send IPv6 addresses to server (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 30ff56f..b7b7840 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.3.1-1 client/rhel/rhn-client-tools/
+1.3.2-1 client/rhel/rhn-client-tools/
commit eede1380199aa1f8d561dea0d753970fcbc1fd30
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Dec 3 11:33:08 2010 +0100
on el5 do not send IPv6 addresses
this will require python-ethtool >= 0.4, which will require libnl >= 1.1, which
is not there
so on el5 we will get here
AttributeError: 'module' object has no attribute
'get_interfaces_info'
lets ignore it.
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d97c8e0..3e8668a 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -15,7 +15,11 @@ BuildRequires: update-desktop-files
Requires: rhnlib >= 2.5.20
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python
+%if 0%{?rhel} && 0%{?rhel} <= 5
+Requires: python-ethtool
+%else
Requires: python-ethtool >= 0.4
+%endif
Requires: gnupg
Requires: sh-utils
Requires: dbus-python
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 acd747f..0cb3ffe 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -532,14 +532,15 @@ def read_network_interfaces():
ip6_list = []
try:
+ dev_info = ethtool.get_interfaces_info(interface)
# one interface may have more IPv6 addresses
- for ip6 in dev.get_ipv6_addresses():
+ for ip6 in dev_info.get_ipv6_addresses():
ip6_list.append({
'scope': ip6.scope,
'addr': ip6.address,
'netmask': ip6.netmask
})
- except:
+ except: #this will does not work on el5, ignore it
pass
intDict[interface] = {'hwaddr':hwaddr,
'ipaddr':ipaddr,