client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 4117152fce1fca1524ce570d24f283b553fb2e4f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 17 14:02:14 2010 +0100
We have socket.settimeout in Python 2.3+.
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 e7bf54f..3f759e4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -732,9 +732,7 @@ def findHostByRoute():
port = int(port)
try:
- # RHEL3 doesn't let you set a timeout, see #164660
- if hasattr(s, "settimeout"):
- s.settimeout(5)
+ s.settimeout(5)
s.connect((server, port))
(intf, port) = s.getsockname()
hostname = socket.gethostbyaddr(intf)[0]