client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 975fa2b6b8b579110f8c7e5ce1047a21f9dec34b
Author: Aron Parsons <parsonsa(a)bit-sys.com>
Date: Fri Dec 30 10:08:40 2011 -0500
Automatic commit of package [rhn-client-tools] release [1.7.1-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index dde6912..4b2cf4a 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.7.0
+Version: 1.7.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -334,6 +334,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Fri Dec 30 2011 Aron Parsons <parsonsa(a)bit-sys.com> 1.7.1-1
+- continue to search for the hostname if IPv6 is disabled (parsonsa@bit-
+
sys.com)
+
* Wed Dec 21 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.46-1
- update copyright info
- 751760 - use __getattr__ rather then __getattribute__ (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index cfdf01d..732e387 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.46-1 client/rhel/rhn-client-tools/
+1.7.1-1 client/rhel/rhn-client-tools/
commit 60b361bba52f028941c657eb4bef7fd41cb35a0c
Author: Aron Parsons <parsonsa(a)bit-sys.com>
Date: Fri Dec 30 10:07:56 2011 -0500
continue to search for the hostname if IPv6 is disabled
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 dfdace6..42f5e06 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -418,7 +418,10 @@ def findHostByRoute():
port = st[servertype]
for family in (AF_INET6, AF_INET):
- s = socket.socket(family)
+ try:
+ s = socket.socket(family)
+ except socket.error:
+ continue
if cfg['enableProxy']:
server_port = config.getProxySetting()