client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++- client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 5 ++++- rel-eng/packages/rhn-client-tools | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit 3d6b5be6187b676a81586b9a53eed36fbf704a08 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Dec 9 11:14:15 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.6.40-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 2758c51..8454db0 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.39 +Version: 1.6.40 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -334,6 +334,9 @@ make -f Makefile.rhn-client-tools test %endif
%changelog +* Fri Dec 09 2011 Miroslav Suchý 1.6.40-1 +- 569790 - for scope on rhel5 do s/global/universe/ + * Fri Dec 02 2011 Miroslav Suchý 1.6.39-1 - IPv6: first try findHostByRoute() and then try getaddrinfo() - IPv6: assign to hostname only if we are unable to resolve it diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 769ba24..6d1ddb8 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -1.6.39-1 client/rhel/rhn-client-tools/ +1.6.40-1 client/rhel/rhn-client-tools/
commit 66e376f35299f9927b3de692ee5998bd12371455 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Dec 9 11:11:50 2011 +0100
569790 - for scope on rhel5 do s/global/universe/
rhel5 has there string 'global' for public ipv6 addresses on rhel6 it is 'universe' lets unify it
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 86500ca..dfdace6 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py @@ -565,8 +565,11 @@ def read_network_interfaces(): for info in dev_info: # one interface may have more IPv6 addresses for ip6 in info.get_ipv6_addresses(): + scope = ip6.scope + if scope == 'global': + scope = 'universe' ip6_list.append({ - 'scope': ip6.scope, + 'scope': scope, 'addr': ip6.address, 'netmask': ip6.netmask })
spacewalk-commits@lists.fedorahosted.org